diff options
| author | Prateek Sachan <42961174+prateek2211@users.noreply.github.com> | 2020-03-18 15:47:18 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 10:17:18 +0000 |
| commit | c019ad708669a4c269072bea933f0a520a78ca7c (patch) | |
| tree | 99b4cd6f06b6d3a1db8fa66666e715fd6cd12e58 /federationsender/storage | |
| parent | c2bd0b97b34c9040325bf31c5c4a2a06579239d9 (diff) | |
Log errors from rows.Close (#920)
* Log errors from rows.Close
* fixed imports
* Added contextual messages
* fixed review changes
Diffstat (limited to 'federationsender/storage')
| -rw-r--r-- | federationsender/storage/postgres/joined_hosts_table.go | 2 | ||||
| -rw-r--r-- | federationsender/storage/sqlite3/joined_hosts_table.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/federationsender/storage/postgres/joined_hosts_table.go b/federationsender/storage/postgres/joined_hosts_table.go index e5c30a01..b3c45abd 100644 --- a/federationsender/storage/postgres/joined_hosts_table.go +++ b/federationsender/storage/postgres/joined_hosts_table.go @@ -118,7 +118,7 @@ func joinedHostsFromStmt( if err != nil { return nil, err } - defer rows.Close() // nolint: errcheck + defer common.CloseAndLogIfError(ctx, rows, "joinedHostsFromStmt: rows.close() failed") var result []types.JoinedHost for rows.Next() { diff --git a/federationsender/storage/sqlite3/joined_hosts_table.go b/federationsender/storage/sqlite3/joined_hosts_table.go index 1437a062..466ae499 100644 --- a/federationsender/storage/sqlite3/joined_hosts_table.go +++ b/federationsender/storage/sqlite3/joined_hosts_table.go @@ -121,7 +121,7 @@ func joinedHostsFromStmt( if err != nil { return nil, err } - defer rows.Close() // nolint: errcheck + defer common.CloseAndLogIfError(ctx, rows, "joinedHostsFromStmt: rows.close() failed") var result []types.JoinedHost for rows.Next() { |