diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2023-05-26 09:31:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 09:31:55 +0200 |
| commit | 18f26cfbf7f9b36b838c0e8762bfba98c89b9797 (patch) | |
| tree | f3bcf0ef2b76601980ab6144e9ce9acd5316a0da /modules/indexer/code | |
| parent | Fix ref type error (#24941) (diff) | |
| download | forgejo-18f26cfbf7f9b36b838c0e8762bfba98c89b9797.tar.xz forgejo-18f26cfbf7f9b36b838c0e8762bfba98c89b9797.zip | |
Improve queue and logger context (#24924)
Before there was a "graceful function": RunWithShutdownFns, it's mainly
for some modules which doesn't support context.
The old queue system doesn't work well with context, so the old queues
need it.
After the queue refactoring, the new queue works with context well, so,
use Golang context as much as possible, the `RunWithShutdownFns` could
be removed (replaced by RunWithCancel for context cancel mechanism), the
related code could be simplified.
This PR also fixes some legacy queue-init problems, eg:
* typo : archiver: "unable to create codes indexer queue" => "unable to
create repo-archive queue"
* no nil check for failed queues, which causes unfriendly panic
After this PR, many goroutines could have better display name:
Diffstat (limited to 'modules/indexer/code')
| -rw-r--r-- | modules/indexer/code/indexer.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/indexer/code/indexer.go b/modules/indexer/code/indexer.go index e9b8e76500..f38fd6000c 100644 --- a/modules/indexer/code/indexer.go +++ b/modules/indexer/code/indexer.go @@ -166,7 +166,7 @@ func Init() { handler := func(items ...*IndexerData) (unhandled []*IndexerData) { idx, err := indexer.get() if idx == nil || err != nil { - log.Error("Codes indexer handler: unable to get indexer!") + log.Warn("Codes indexer handler: indexer is not ready, retry later.") return items } @@ -201,7 +201,7 @@ func Init() { return unhandled } - indexerQueue = queue.CreateUniqueQueue("code_indexer", handler) + indexerQueue = queue.CreateUniqueQueue(ctx, "code_indexer", handler) if indexerQueue == nil { log.Fatal("Unable to create codes indexer queue") } @@ -259,7 +259,7 @@ func Init() { indexer.set(rIndexer) // Start processing the queue - go graceful.GetManager().RunWithShutdownFns(indexerQueue.Run) + go graceful.GetManager().RunWithCancel(indexerQueue) if populate { go graceful.GetManager().RunWithShutdownContext(populateRepoIndexer) |