Skip to content

Commit 2ba747e

Browse files
committed
test: tokenLock queries
Signed-off-by: ADIR <adir@il.ibm.com>
1 parent ce7f6c4 commit 2ba747e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

token/services/db/sql/postgres/tokenlock.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func NewTokenLockStore(dbs *common2.RWDB, tableNames common.TableNames) (*TokenL
4040
}
4141

4242
func (db *TokenLockStore) Cleanup(ctx context.Context, leaseExpiry time.Duration) error {
43-
if _, err := db.logStaleLocks(ctx, leaseExpiry); err != nil {
43+
if err := db.logStaleLocks(ctx, leaseExpiry); err != nil {
4444
db.Logger.Warnf("Could not log stale locks: %v", err)
4545
}
4646
tokenLocks, tokenRequests := q.Table(db.Table.TokenLocks), q.Table(db.Table.Requests)
@@ -63,9 +63,9 @@ func (db *TokenLockStore) Cleanup(ctx context.Context, leaseExpiry time.Duration
6363
return err
6464
}
6565

66-
func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Duration) ([]lockEntry, error) {
66+
func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Duration) error {
6767
if !db.Logger.IsEnabledFor(zapcore.InfoLevel) {
68-
return nil, nil
68+
return nil
6969
}
7070
tokenLocks, tokenRequests := q.Table(db.Table.TokenLocks), q.Table(db.Table.Requests)
7171

@@ -80,7 +80,7 @@ func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Du
8080

8181
rows, err := db.ReadDB.QueryContext(ctx, query, args...)
8282
if err != nil {
83-
return nil, err
83+
return err
8484
}
8585

8686
it := common4.NewIterator(rows, func(entry *lockEntry) error {
@@ -89,11 +89,11 @@ func (db *TokenLockStore) logStaleLocks(ctx context.Context, leaseExpiry time.Du
8989
})
9090
lockEntries, err := iterators.ReadAllValues(it)
9191
if err != nil {
92-
return nil, err
92+
return err
9393
}
9494

9595
db.Logger.Infof("Found following entries ready for deletion: [%v]", lockEntries)
96-
return lockEntries, nil
96+
return nil
9797
}
9898

9999
type lockEntry struct {

0 commit comments

Comments
 (0)