From 2c1e58bd1206d90865511b07aba3dfe02a599977 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 16 Aug 2021 04:52:26 +0800 Subject: [PATCH] Upgrade levelqueue 0.4.1 (#16696) --- go.mod | 2 +- go.sum | 4 ++-- vendor/gitea.com/lunny/levelqueue/queue.go | 8 ++++---- vendor/modules.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 3b73690d6ebc6..40f6ade2bd334 100644 --- 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 e7a2f98681d95..64d44eb34aef9 100644 --- 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 948e019be8f91..328769d2bd2ab 100644 --- 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 44c38da636fa3..9b2a96ad53862 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.4.0 +# gitea.com/lunny/levelqueue v0.4.1 ## explicit gitea.com/lunny/levelqueue # github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c