mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-12 09:23:09 -06:00
rows defer close , log with err
This commit is contained in:
parent
b09d6801f7
commit
2e20f7bcab
|
|
@ -20,7 +20,7 @@ import (
|
|||
"github.com/matrix-org/dendrite/encryptoapi/routing"
|
||||
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
|
||||
"github.com/matrix-org/dendrite/encryptoapi/storage"
|
||||
"fmt"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// in order to gain key management capability
|
||||
|
|
@ -32,9 +32,10 @@ func SetupEcryptoapi(
|
|||
accountsDB *accounts.Database,
|
||||
deviceDB *devices.Database,
|
||||
) {
|
||||
|
||||
encryptionDB, err := storage.NewDatabase(string(base.Cfg.Database.EncryptAPI))
|
||||
fmt.Print(err)
|
||||
if err != nil {
|
||||
logrus.WithError(err).Panicf("failed to connect to encryption db")
|
||||
}
|
||||
routing.Setup(
|
||||
base.APIMux,
|
||||
*base.Cfg,
|
||||
|
|
@ -43,5 +44,4 @@ func SetupEcryptoapi(
|
|||
deviceDB,
|
||||
)
|
||||
routing.InitNotifier(base)
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -113,6 +113,7 @@ func (ks *keyStatements) selectKey(
|
|||
) (holders []types.KeyHolder, err error) {
|
||||
stmt := common.TxStmt(txn, ks.selectKeyStmt)
|
||||
rows, err := stmt.QueryContext(ctx, userID, deviceID)
|
||||
defer rows.Close()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -167,6 +168,7 @@ func (ks *keyStatements) selectInKeys(
|
|||
arr []string,
|
||||
) (holders []types.KeyHolder, err error) {
|
||||
rows := &sql.Rows{}
|
||||
defer rows.Close()
|
||||
stmt := ks.selectAllKeyStmt
|
||||
if len(arr) == 0 {
|
||||
rows, err = stmt.QueryContext(ctx, userID, "device_key")
|
||||
|
|
|
|||
Loading…
Reference in a new issue