Browse Source

improve struct

master
palytoxin 4 years ago
parent
commit
aae0fbe1a1
6 changed files with 21 additions and 21 deletions
  1. +0
    -1
      .tool-versions
  2. +7
    -0
      modules/decompression/decompression.go
  3. +3
    -3
      modules/setting/setting.go
  4. +3
    -3
      modules/worker/task.go
  5. +6
    -12
      modules/worker/worker.go
  6. +2
    -2
      routers/init.go

+ 0
- 1
.tool-versions View File

@@ -1 +0,0 @@
nodejs 12.14.0

+ 7
- 0
modules/decompression/decompression.go View File

@@ -0,0 +1,7 @@
package decompression

import "code.gitea.io/gitea/modules/worker"

func NewContext() {
worker.NewTaskCenter()
}

+ 3
- 3
modules/setting/setting.go View File

@@ -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.


+ 3
- 3
modules/worker/task.go View File

@@ -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


+ 6
- 12
modules/worker/worker.go View File

@@ -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
}


+ 2
- 2
routers/init.go View File

@@ -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


Loading…
Cancel
Save