diff options
| -rw-r--r-- | cmd/hook.go | 12 | ||||
| -rw-r--r-- | modules/migrations/github.go | 3 | ||||
| -rw-r--r-- | modules/queue/queue_wrapped.go | 3 | ||||
| -rw-r--r-- | modules/queue/workerpool.go | 22 | ||||
| -rw-r--r-- | modules/util/timer.go | 21 |
5 files changed, 32 insertions, 29 deletions
diff --git a/cmd/hook.go b/cmd/hook.go index 331f6a2d2d..fa932087fe 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/private" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "github.com/urfave/cli" ) @@ -113,15 +114,8 @@ func (d *delayWriter) Close() error { if d == nil { return nil } - stopped := d.timer.Stop() - if stopped { - return nil - } - select { - case <-d.timer.C: - default: - } - if d.buf == nil { + stopped := util.StopTimer(d.timer) + if stopped || d.buf == nil { return nil } _, err := d.internal.Write(d.buf.Bytes()) diff --git a/modules/migrations/github.go b/modules/migrations/github.go index 488cd82f5b..b6bdab09f4 100644 --- a/modules/migrations/github.go +++ b/modules/migrations/github.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/migrations/base" "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "github.com/google/go-github/v24/github" "golang.org/x/oauth2" @@ -121,7 +122,7 @@ func (g *GithubDownloaderV3) sleep() { timer := time.NewTimer(time.Until(g.rate.Reset.Time)) select { case <-g.ctx.Done(): - timer.Stop() + util.StopTimer(timer) return case <-timer.C: } 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 { diff --git a/modules/util/timer.go b/modules/util/timer.go new file mode 100644 index 0000000000..b682f376d9 --- /dev/null +++ b/modules/util/timer.go @@ -0,0 +1,21 @@ +// Copyright 2020 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package util + +import ( + "time" +) + +// StopTimer is a utility function to safely stop a time.Timer and clean its channel +func StopTimer(t *time.Timer) bool { + stopped := t.Stop() + if !stopped { + select { + case <-t.C: + default: + } + } + return stopped +} |