mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-14 18:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

rows defer close , log with err

Browse source
This commit is contained in:
terrill 2018-07-05 00:27:11 +08:00
parent b09d6801f7
commit 2e20f7bcab
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/github.com/matrix-org/dendrite/encryptoapi/encryptoapi.go
View file

@ -20,7 +20,7 @@ import (
"github.com/matrix-org/dendrite/encryptoapi/routing" "github.com/matrix-org/dendrite/encryptoapi/routing"
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices" "github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
"github.com/matrix-org/dendrite/encryptoapi/storage" "github.com/matrix-org/dendrite/encryptoapi/storage"
"fmt" "github.com/sirupsen/logrus"
) )
// in order to gain key management capability // in order to gain key management capability
@ -32,9 +32,10 @@ func SetupEcryptoapi(
accountsDB *accounts.Database, accountsDB *accounts.Database,
deviceDB *devices.Database, deviceDB *devices.Database,
) { ) {
encryptionDB, err := storage.NewDatabase(string(base.Cfg.Database.EncryptAPI)) 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( routing.Setup(
base.APIMux, base.APIMux,
*base.Cfg, *base.Cfg,
@ -43,5 +44,4 @@ func SetupEcryptoapi(
deviceDB, deviceDB,
) )
routing.InitNotifier(base) routing.InitNotifier(base)
} }

2
src/github.com/matrix-org/dendrite/encryptoapi/storage/encrypt_keys_table.go
View file

@ -113,6 +113,7 @@ func (ks *keyStatements) selectKey(
) (holders []types.KeyHolder, err error) { ) (holders []types.KeyHolder, err error) {
stmt := common.TxStmt(txn, ks.selectKeyStmt) stmt := common.TxStmt(txn, ks.selectKeyStmt)
rows, err := stmt.QueryContext(ctx, userID, deviceID) rows, err := stmt.QueryContext(ctx, userID, deviceID)
defer rows.Close()
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -167,6 +168,7 @@ func (ks *keyStatements) selectInKeys(
arr []string, arr []string,
) (holders []types.KeyHolder, err error) { ) (holders []types.KeyHolder, err error) {
rows := &sql.Rows{} rows := &sql.Rows{}
defer rows.Close()
stmt := ks.selectAllKeyStmt stmt := ks.selectAllKeyStmt
if len(arr) == 0 { if len(arr) == 0 {
rows, err = stmt.QueryContext(ctx, userID, "device_key") rows, err = stmt.QueryContext(ctx, userID, "device_key")