Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Use errors.Wrapf instead of nested fmt.Sprintf (#1933)

Browse source
This commit is contained in:
Zachary Wasserman 2018-10-02 15:19:50 -07:00 committed by GitHub
parent dceedd93e8
commit 3fa3fe7fdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/datastore/mysql/delete.go
View file

@ -14,7 +14,7 @@ func (d *Datastore) deleteEntity(dbTable string, id uint) error {
`, dbTable)
result, err := d.db.Exec(deleteStmt, d.clock.Now(), id)
if err != nil {
return errors.Wrap(err, fmt.Sprintf("delete %s", dbTable))
return errors.Wrapf(err, "delete %s", dbTable)
}
rows, _ := result.RowsAffected()
if rows != 1 {
@ -33,7 +33,7 @@ func (d *Datastore) deleteEntityByName(dbTable string, name string) error {
if isMySQLForeignKey(err) {
return foreignKey(dbTable, name)
}
return errors.Wrap(err, fmt.Sprintf("delete %s", dbTable))
return errors.Wrapf(err, "delete %s", dbTable)
}
rows, _ := result.RowsAffected()
if rows != 1 {

3
server/datastore/mysql/options.go
View file

@ -2,7 +2,6 @@ package mysql
import (
"database/sql"
"fmt"
"github.com/kolide/fleet/server/datastore/internal/appstate"
"github.com/kolide/fleet/server/kolide"
@ -23,7 +22,7 @@ func (d *Datastore) ResetOptions() (opts []kolide.Option, err error) {
defer func() {
if err != nil {
if txErr := txn.Rollback(); txErr != nil {
err = errors.Wrap(err, fmt.Sprintf("reset options failed, transaction rollback failed with error: %s", txErr))
err = errors.Wrapf(err, "reset options failed, transaction rollback failed with error: %s", txErr)
}
}
}()