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

Fix sql-related missing Close/Err calls (#1769)

Browse source
This commit is contained in:
Martin Angers 2021-08-23 16:33:41 -04:00 committed by GitHub
parent 40b0888416
commit bfdc014cc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/datastore/mysql/app_configs.go
View file

@ -45,8 +45,14 @@ func (d *Datastore) isEventSchedulerEnabled() (bool, error) {
if err != nil {
return false, err
}
defer rows.Close()
if !rows.Next() {
return false, errors.New("Error detecting MySQL event scheduler status.")
err := errors.New("Error detecting MySQL event scheduler status.")
if rerr := rows.Err(); rerr != nil {
err = rerr
}
return false, err
}
var value string
if err := rows.Scan(&value); err != nil {

5
server/datastore/mysql/labels.go
View file

@ -35,6 +35,7 @@ func (d *Datastore) ApplyLabelSpecs(specs []*fleet.LabelSpec) (err error) {
if err != nil {
return errors.Wrap(err, "prepare ApplyLabelSpecs insert")
}
defer stmt.Close()
for _, s := range specs {
if s.Name == "" {
@ -324,9 +325,11 @@ func (d *Datastore) LabelQueriesForHost(host *fleet.Host, cutoff time.Time) (map
results[id] = query
}
if err := rows.Err(); err != nil {
return nil, errors.Wrap(err, "iterating over returned rows")
}
return results, nil
}
func (d *Datastore) RecordLabelQueryExecutions(host *fleet.Host, results map[uint]bool, updated time.Time) error {

1
server/datastore/mysql/queries.go
View file

@ -49,6 +49,7 @@ func (d *Datastore) ApplyQueries(authorID uint, queries []*fleet.Query) (err err
if err != nil {
return errors.Wrap(err, "prepare ApplyQueries insert")
}
defer stmt.Close()
for _, q := range queries {
if q.Name == "" {