diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index ad70fcacb..000000000 --- a/.tool-versions +++ /dev/null @@ -1 +0,0 @@ -nodejs 12.14.0 diff --git a/modules/decompression/decompression.go b/modules/decompression/decompression.go new file mode 100644 index 000000000..30c6b477c --- /dev/null +++ b/modules/decompression/decompression.go @@ -0,0 +1,7 @@ +package decompression + +import "code.gitea.io/gitea/modules/worker" + +func NewContext() { + worker.NewTaskCenter() +} diff --git a/modules/setting/setting.go b/modules/setting/setting.go index cd24597b9..926d643b1 100755 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -420,9 +420,9 @@ var ( UILocation = time.Local //Machinery config - Broker string - DefaultQueue string - ResultBackend string + Broker string + DefaultQueue string + ResultBackend string ) // DateLang transforms standard language locale name to corresponding value in datetime plugin. diff --git a/modules/worker/task.go b/modules/worker/task.go index 93aee3ecd..073b16b92 100755 --- a/modules/worker/task.go +++ b/modules/worker/task.go @@ -10,10 +10,10 @@ import ( // 方法名 const ( - DecompressTaskName = "Decompress" + DecompressTaskName = "Decompress" ) -func SendDecompressTask(ctx context.Context, uuid string) error{ +func SendDecompressTask(ctx context.Context, uuid string) error { args := []tasks.Arg{{Name: "uuid", Type: "string", Value: uuid}} task, err := tasks.NewSignature(DecompressTaskName, args) if err != nil { @@ -22,7 +22,7 @@ func SendDecompressTask(ctx context.Context, uuid string) error{ } task.RetryCount = 3 - _,err = AsyncTaskCenter.SendTaskWithContext(ctx, task) + _, err = AsyncTaskCenter.SendTaskWithContext(ctx, task) if err != nil { log.Error("SendTaskWithContext failed:", err.Error()) return err diff --git a/modules/worker/worker.go b/modules/worker/worker.go index ab44d2472..37445c978 100755 --- a/modules/worker/worker.go +++ b/modules/worker/worker.go @@ -10,21 +10,15 @@ var ( AsyncTaskCenter *machinery.Server ) -func Init() { - tc, err := NewTaskCenter() - if err != nil { - panic(err) - } - AsyncTaskCenter = tc -} - -func NewTaskCenter() (*machinery.Server, error) { +func NewTaskCenter() { cnf := &mchConf.Config{ Broker: setting.Broker, DefaultQueue: setting.DefaultQueue, ResultBackend: setting.ResultBackend, } - // Create server instance - return machinery.NewServer(cnf) + tc, err := machinery.NewServer(cnf) + if err != nil { + panic(err) + } + AsyncTaskCenter = tc } - diff --git a/routers/init.go b/routers/init.go index c2b6da92a..dafe0a202 100755 --- a/routers/init.go +++ b/routers/init.go @@ -15,6 +15,7 @@ import ( "code.gitea.io/gitea/modules/auth/sso" "code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/cron" + "code.gitea.io/gitea/modules/decompression" "code.gitea.io/gitea/modules/eventsource" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/highlight" @@ -31,7 +32,6 @@ import ( "code.gitea.io/gitea/modules/storage" "code.gitea.io/gitea/modules/task" "code.gitea.io/gitea/modules/webhook" - "code.gitea.io/gitea/modules/worker" "code.gitea.io/gitea/services/mailer" mirror_service "code.gitea.io/gitea/services/mirror" pull_service "code.gitea.io/gitea/services/pull" @@ -62,7 +62,7 @@ func NewServices() { mailer.NewContext() _ = cache.NewContext() notification.NewContext() - worker.Init() + decompression.NewContext() } // In case of problems connecting to DB, retry connection. Eg, PGSQL in Docker Container on Synology