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 /syncapi/storage/postgres/output_room_events_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 'syncapi/storage/postgres/output_room_events_table.go')
| -rw-r--r-- | syncapi/storage/postgres/output_room_events_table.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/syncapi/storage/postgres/output_room_events_table.go b/syncapi/storage/postgres/output_room_events_table.go index 2db46c5d..e7cf1935 100644 --- a/syncapi/storage/postgres/output_room_events_table.go +++ b/syncapi/storage/postgres/output_room_events_table.go @@ -169,7 +169,7 @@ func (s *outputRoomEventsStatements) selectStateInRange( if err != nil { return nil, nil, err } - defer rows.Close() // nolint: errcheck + defer common.CloseAndLogIfError(ctx, rows, "selectStateInRange: rows.close() failed") // Fetch all the state change events for all rooms between the two positions then loop each event and: // - Keep a cache of the event by ID (99% of state change events are for the event itself) // - For each room ID, build up an array of event IDs which represents cumulative adds/removes @@ -303,7 +303,7 @@ func (s *outputRoomEventsStatements) selectRecentEvents( if err != nil { return nil, err } - defer rows.Close() // nolint: errcheck + defer common.CloseAndLogIfError(ctx, rows, "selectRecentEvents: rows.close() failed") events, err := rowsToStreamEvents(rows) if err != nil { return nil, err @@ -330,7 +330,7 @@ func (s *outputRoomEventsStatements) selectEarlyEvents( if err != nil { return nil, err } - defer rows.Close() // nolint: errcheck + defer common.CloseAndLogIfError(ctx, rows, "selectEarlyEvents: rows.close() failed") events, err := rowsToStreamEvents(rows) if err != nil { return nil, err @@ -354,7 +354,7 @@ func (s *outputRoomEventsStatements) selectEvents( if err != nil { return nil, err } - defer rows.Close() // nolint: errcheck + defer common.CloseAndLogIfError(ctx, rows, "selectEvents: rows.close() failed") return rowsToStreamEvents(rows) } |