From c019ad708669a4c269072bea933f0a520a78ca7c Mon Sep 17 00:00:00 2001
From: Prateek Sachan <42961174+prateek2211@users.noreply.github.com>
Date: Wed, 18 Mar 2020 15:47:18 +0530
Subject: Log errors from rows.Close (#920)

* Log errors from rows.Close

* fixed imports

* Added contextual messages

* fixed review changes
---
 common/keydb/postgres/server_key_table.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'common/keydb/postgres/server_key_table.go')

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
-- 
cgit v1.2.3