Upgrade levelqueue 0.4.1 (#16696) (#16700)

diff --git a/go.mod b/go.mod
index 3b73690d6ebc6ccf432c45b4dc17b7ad2197bde2..40f6ade2bd334aef407ddf882d10ab8d8af68ac4 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
        gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e
        gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e
        gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee
-       gitea.com/lunny/levelqueue v0.4.0
+       gitea.com/lunny/levelqueue v0.4.1
        github.com/Microsoft/go-winio v0.5.0 // indirect
        github.com/NYTimes/gziphandler v1.1.1
        github.com/ProtonMail/go-crypto v0.0.0-20210705153151-cc34b1f6908b // indirect

diff --git a/go.sum b/go.sum
index e7a2f98681d95f5736022e45bcb686b812620fa1..64d44eb34aef941a6c0e028b58370007177f356c 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -49,8 +49,8 @@ gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e h1:YjaQU6XFicdhPN+Ml
 gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e/go.mod h1:nfA7JaGv3hbGQ1ktdhAsZhdS84qKffI8NMlHr+Opsog=
 gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee h1:9U6HuKUBt/cGK6T/64dEuz0r7Yp97WAAEJvXHDlY3ws=
 gitea.com/go-chi/session v0.0.0-20210108030337-0cb48c5ba8ee/go.mod h1:Ozg8IchVNb/Udg+ui39iHRYqVHSvf3C99ixdpLR8Vu0=
-gitea.com/lunny/levelqueue v0.4.0 h1:v+bCR1lwLTBpZMshguWNhGIFLkUj+R04pgaU3TcJFS8=
-gitea.com/lunny/levelqueue v0.4.0/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
+gitea.com/lunny/levelqueue v0.4.1 h1:RZ+AFx5gBsZuyqCvofhAkPQ9uaVDPJnsULoJZIYaJNw=
+gitea.com/lunny/levelqueue v0.4.1/go.mod h1:HBqmLbz56JWpfEGG0prskAV97ATNRoj5LDmPicD22hU=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s=
 gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU=
 github.com/6543/go-version v1.3.1 h1:HvOp+Telns7HWJ2Xo/05YXQSB2bE0WmVgbHqwMPZT4U=

diff --git a/vendor/gitea.com/lunny/levelqueue/queue.go b/vendor/gitea.com/lunny/levelqueue/queue.go
index 948e019be8f91dafc95c1b807745df5b1c084f71..328769d2bd2ab3421f328f2481a69cf002a77d65 100644 (file)
--- a/vendor/gitea.com/lunny/levelqueue/queue.go
+++ b/vendor/gitea.com/lunny/levelqueue/queue.go
@@ -21,8 +21,8 @@ const (
 // Queue defines a queue struct
 type Queue struct {
        db                *leveldb.DB
-       highLock          sync.Mutex
-       lowLock           sync.Mutex
+       lowLock           sync.Mutex // If you are locking both high and low locks, lock the low lock before the high lock
+       highLock          sync.Mutex // If you are locking both high and low locks, lock the low lock before the high lock
        low               int64
        high              int64
        lowKey            []byte
@@ -295,10 +295,10 @@ 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()
+       queue.highLock.Lock()
        defer queue.lowLock.Unlock()
+       defer queue.highLock.Unlock()
 
        if !queue.closeUnderlyingDB {
                queue.db = nil

diff --git a/vendor/modules.txt b/vendor/modules.txt
index 44c38da636fa375891f1fb3850c17bfeebbf3b99..9b2a96ad538620779f37af16b36d860285212994 100644 (file)
--- 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.4.0
+# gitea.com/lunny/levelqueue v0.4.1
 ## explicit
 gitea.com/lunny/levelqueue
 # github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c