From 745be45e1b033fe0526317508a7c8ad0dbc9e7e5 Mon Sep 17 00:00:00 2001 From: Jason Song Date: Wed, 16 Nov 2022 10:09:44 +0800 Subject: [PATCH] chore: rename to Init --- modules/bots/bots.go | 7 +++++++ modules/bots/job_emitter.go | 5 ----- routers/init.go | 2 +- services/bots/clear_tasks.go | 5 +++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/bots/bots.go b/modules/bots/bots.go index 4c11a60e75..6013ec6ae8 100644 --- a/modules/bots/bots.go +++ b/modules/bots/bots.go @@ -11,11 +11,18 @@ import ( "code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/modules/git" + "code.gitea.io/gitea/modules/graceful" "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/queue" "github.com/nektos/act/pkg/model" ) +func Init() { + jobEmitterQueue = queue.CreateUniqueQueue("bots_ready_job", jobEmitterQueueHandle, new(jobUpdate)) + go graceful.GetManager().RunWithShutdownFns(jobEmitterQueue.Run) +} + func ListWorkflows(commit *git.Commit) (git.Entries, error) { tree, err := commit.SubTree(".gitea/workflows") if _, ok := err.(git.ErrNotExist); ok { diff --git a/modules/bots/job_emitter.go b/modules/bots/job_emitter.go index 5ecd1414ab..b236b7ffce 100644 --- a/modules/bots/job_emitter.go +++ b/modules/bots/job_emitter.go @@ -23,11 +23,6 @@ type jobUpdate struct { RunID int64 } -func InitJobEmitter() { - jobEmitterQueue = queue.CreateUniqueQueue("bots_ready_job", jobEmitterQueueHandle, new(jobUpdate)) - go graceful.GetManager().RunWithShutdownFns(jobEmitterQueue.Run) -} - func EmitJobsIfReady(runID int64) error { err := jobEmitterQueue.Push(&jobUpdate{ RunID: runID, diff --git a/routers/init.go b/routers/init.go index 03e151f727..cb543fa719 100644 --- a/routers/init.go +++ b/routers/init.go @@ -175,7 +175,7 @@ func GlobalInitInstalled(ctx context.Context) { auth.Init() svg.Init() - bots.InitJobEmitter() + bots.Init() // Finally start up the cron cron.NewContext(ctx) diff --git a/services/bots/clear_tasks.go b/services/bots/clear_tasks.go index a525b50e05..e6f091d52e 100644 --- a/services/bots/clear_tasks.go +++ b/services/bots/clear_tasks.go @@ -12,13 +12,14 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/timeutil" + runnerv1 "gitea.com/gitea/proto-go/runner/v1" ) const ( zombieTaskTimeout = 10 * time.Minute - endlessTaskTimeout = 3 * time.Hour // the task is running for a long time with updates - abandonedJobTimeout = 24 * time.Hour // the job is waiting for being picked by a runner + endlessTaskTimeout = 3 * time.Hour + abandonedJobTimeout = 24 * time.Hour ) // StopZombieTasks stops the task which have running status, but haven't been updated for a long time