diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-07-28 00:59:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-27 18:59:06 +0200 |
commit | 840d240a6123ede236d452f2dec7347ca6d35642 (patch) | |
tree | 166019417ef90a82ccc66aac6ad2c8a5c2454d28 /vendor | |
parent | 7365b4e757fe522602dcdda7d671a9d300525236 (diff) | |
download | gitea-840d240a6123ede236d452f2dec7347ca6d35642.tar.gz gitea-840d240a6123ede236d452f2dec7347ca6d35642.zip |
Upgrade levelqueue to v0.4.0 (#16560) (#16561)
Fix #16546
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gitea.com/lunny/levelqueue/queue.go | 5 | ||||
-rw-r--r-- | vendor/gitea.com/lunny/levelqueue/set.go | 2 | ||||
-rw-r--r-- | vendor/gitea.com/lunny/levelqueue/uniquequeue.go | 2 | ||||
-rw-r--r-- | vendor/modules.txt | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/vendor/gitea.com/lunny/levelqueue/queue.go b/vendor/gitea.com/lunny/levelqueue/queue.go index 0570cc572d..948e019be8 100644 --- a/vendor/gitea.com/lunny/levelqueue/queue.go +++ b/vendor/gitea.com/lunny/levelqueue/queue.go @@ -295,6 +295,11 @@ func (queue *Queue) LHandle(h func([]byte) error) error { // Close closes the queue (and the underlying db is set to closeUnderlyingDB) func (queue *Queue) Close() error { + queue.highLock.Lock() + queue.lowLock.Lock() + defer queue.highLock.Unlock() + defer queue.lowLock.Unlock() + if !queue.closeUnderlyingDB { queue.db = nil return nil diff --git a/vendor/gitea.com/lunny/levelqueue/set.go b/vendor/gitea.com/lunny/levelqueue/set.go index f5995cb8f1..7e0e65c554 100644 --- a/vendor/gitea.com/lunny/levelqueue/set.go +++ b/vendor/gitea.com/lunny/levelqueue/set.go @@ -107,6 +107,8 @@ func (set *Set) Remove(value []byte) (bool, error) { // Close closes the set (and the underlying db if set to closeUnderlyingDB) func (set *Set) Close() error { + set.lock.Lock() + defer set.lock.Unlock() if !set.closeUnderlyingDB { set.db = nil return nil diff --git a/vendor/gitea.com/lunny/levelqueue/uniquequeue.go b/vendor/gitea.com/lunny/levelqueue/uniquequeue.go index a53abb2c4e..8d66e008de 100644 --- a/vendor/gitea.com/lunny/levelqueue/uniquequeue.go +++ b/vendor/gitea.com/lunny/levelqueue/uniquequeue.go @@ -181,6 +181,8 @@ func (queue *UniqueQueue) Len() int64 { func (queue *UniqueQueue) Close() error { _ = queue.q.Close() _ = queue.set.Close() + queue.set.lock.Lock() + defer queue.set.lock.Unlock() if !queue.closeUnderlyingDB { queue.db = nil return nil diff --git a/vendor/modules.txt b/vendor/modules.txt index b590159d54..7f0460bd2c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -25,7 +25,7 @@ gitea.com/go-chi/session/couchbase gitea.com/go-chi/session/memcache gitea.com/go-chi/session/mysql gitea.com/go-chi/session/postgres -# gitea.com/lunny/levelqueue v0.3.0 +# gitea.com/lunny/levelqueue v0.4.0 ## explicit gitea.com/lunny/levelqueue # github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c |