arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #766 from Allda/lock_timeout

Browse Source 
Fix: lock updater - return correct bool value
This commit is contained in:
Jimmy Zelinskie 2019-04-11 13:44:10 -04:00 committed by GitHub
commit d79827690c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database/dbutil.go
View File

@ -360,7 +360,7 @@ func AcquireLock(datastore Datastore, name, owner string, duration time.Duration
// ExtendLock extends the duration of an existing global lock for the given // ExtendLock extends the duration of an existing global lock for the given
// duration. // duration.
func ExtendLock(ds Datastore, name, whoami string, desiredLockDuration time.Duration) (extended bool, expiration time.Time) { func ExtendLock(ds Datastore, name, whoami string, desiredLockDuration time.Duration) (bool, time.Time) {
tx, err := ds.Begin() tx, err := ds.Begin()
if err != nil { if err != nil {
return false, time.Time{} return false, time.Time{}
@ -374,7 +374,7 @@ func ExtendLock(ds Datastore, name, whoami string, desiredLockDuration time.Dura
if locked { if locked {
if err := tx.Commit(); err == nil { if err := tx.Commit(); err == nil {
return return locked, expiration
} }
} }