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 /common/keydb/postgres/server_key_table.go | |
| 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 'common/keydb/postgres/server_key_table.go')
| -rw-r--r-- | common/keydb/postgres/server_key_table.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/keydb/postgres/server_key_table.go b/common/keydb/postgres/server_key_table.go index 6b13cc3c..0434eb8b 100644 --- a/common/keydb/postgres/server_key_table.go +++ b/common/keydb/postgres/server_key_table.go @@ -19,6 +19,8 @@ import ( "context" "database/sql" + "github.com/matrix-org/dendrite/common" + "github.com/lib/pq" "github.com/matrix-org/gomatrixserverlib" ) @@ -91,7 +93,7 @@ func (s *serverKeyStatements) bulkSelectServerKeys( if err != nil { return nil, err } - defer rows.Close() // nolint: errcheck + defer common.CloseAndLogIfError(ctx, rows, "bulkSelectServerKeys: rows.close() failed") results := map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult{} for rows.Next() { var serverName string |