diff options
Diffstat (limited to 'modules/queue')
| -rw-r--r-- | modules/queue/queue_wrapped.go | 3 | ||||
| -rw-r--r-- | modules/queue/workerpool.go | 22 |
2 files changed, 6 insertions, 19 deletions
diff --git a/modules/queue/queue_wrapped.go b/modules/queue/queue_wrapped.go index 482c90a810..88d64e8246 100644 --- a/modules/queue/queue_wrapped.go +++ b/modules/queue/queue_wrapped.go @@ -12,6 +12,7 @@ import ( "time" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" ) // WrappedQueueType is the type for a wrapped delayed starting queue @@ -88,7 +89,7 @@ func (q *delayedStarter) setInternal(atShutdown func(context.Context, func()), h t := time.NewTimer(sleepTime) select { case <-ctx.Done(): - t.Stop() + util.StopTimer(t) case <-t.C: } } diff --git a/modules/queue/workerpool.go b/modules/queue/workerpool.go index 952e87681e..45378e3dae 100644 --- a/modules/queue/workerpool.go +++ b/modules/queue/workerpool.go @@ -11,6 +11,7 @@ import ( "time" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/util" ) // WorkerPool represent a dynamically growable worker pool for a @@ -92,12 +93,7 @@ func (p *WorkerPool) pushBoost(data Data) { p.lock.Unlock() select { case p.dataChan <- data: - if timer.Stop() { - select { - case <-timer.C: - default: - } - } + util.StopTimer(timer) case <-timer.C: p.lock.Lock() if p.blockTimeout > ourTimeout || (p.numberOfWorkers > p.maxNumberOfWorkers && p.maxNumberOfWorkers >= 0) { @@ -353,12 +349,7 @@ func (p *WorkerPool) doWork(ctx context.Context) { timer := time.NewTimer(delay) select { case <-ctx.Done(): - if timer.Stop() { - select { - case <-timer.C: - default: - } - } + util.StopTimer(timer) if len(data) > 0 { log.Trace("Handling: %d data, %v", len(data), data) p.handle(data...) @@ -367,12 +358,7 @@ func (p *WorkerPool) doWork(ctx context.Context) { log.Trace("Worker shutting down") return case datum, ok := <-p.dataChan: - if timer.Stop() { - select { - case <-timer.C: - default: - } - } + util.StopTimer(timer) if !ok { // the dataChan has been closed - we should finish up: if len(data) > 0 { |