From 1306a5bec030e9dd912f17dc8c4d9498d68c3947 Mon Sep 17 00:00:00 2001 From: Rogee Date: Wed, 10 Sep 2025 18:06:24 +0800 Subject: [PATCH] feat: update --- templates/project/Makefile.raw | 2 ++ templates/project/app/jobs/demo_job.go.tpl | 8 ++++---- templates/project/app/jobs/demo_job_test.go.tpl | 11 ++--------- templates/project/providers/http/engine.go.tpl | 15 ++++++++------- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/templates/project/Makefile.raw b/templates/project/Makefile.raw index ce1fed2..1be727b 100755 --- a/templates/project/Makefile.raw +++ b/templates/project/Makefile.raw @@ -42,3 +42,5 @@ init: tools @atomctl gen provider @buf generate @go mod tidy + @go get -u + @go mod tidy diff --git a/templates/project/app/jobs/demo_job.go.tpl b/templates/project/app/jobs/demo_job.go.tpl index 9f824ee..e36dab8 100644 --- a/templates/project/app/jobs/demo_job.go.tpl +++ b/templates/project/app/jobs/demo_job.go.tpl @@ -40,14 +40,14 @@ func (w *DemoJobWorker) NextRetry(job *Job[DemoJob]) time.Time { } func (w *DemoJobWorker) Work(ctx context.Context, job *Job[DemoJob]) error { - log = log.WithField("job", job.Kind()) + logger := log.WithField("job", job.Args.Kind()) - log.Infof("[START] %s args: %v", job.Kind(), job.Args.Strings) - defer log.Infof("[END] %s", job.Kind()) + logger.Infof("[START] %s args: %v", job.Args.Kind(), job.Args.Strings) + defer logger.Infof("[END] %s", job.Args.Kind()) // modify below sort.Strings(job.Args.Strings) - log.Infof("[%s] Sorted strings: %v\n", time.Now().Format(time.TimeOnly), job.Args.Strings) + logger.Infof("[%s] Sorted strings: %v\n", time.Now().Format(time.TimeOnly), job.Args.Strings) return nil } diff --git a/templates/project/app/jobs/demo_job_test.go.tpl b/templates/project/app/jobs/demo_job_test.go.tpl index 5136787..769f144 100644 --- a/templates/project/app/jobs/demo_job_test.go.tpl +++ b/templates/project/app/jobs/demo_job_test.go.tpl @@ -4,10 +4,8 @@ import ( "context" "testing" - "{{.ModuleName}}/app/srv/services" + "{{.ModuleName}}/app/services" "{{.ModuleName}}/app/srv/testx" - "{{.ModuleName}}/providers/app" - "{{.ModuleName}}/providers/job" . "github.com/riverqueue/river" . "github.com/smartystreets/goconvey/convey" @@ -21,8 +19,6 @@ type DemoJobSuiteInjectParams struct { dig.In Initials []contracts.Initial `group:"initials"` // nolint:structcheck - Job *job.Job - App *app.Config } type DemoJobSuite struct { @@ -48,10 +44,7 @@ func (t *DemoJobSuite) Test_Work() { }, } - worker := &DemoJobWorker{ - job: t.Job, - app: t.App, - } + worker := &DemoJobWorker{} err := worker.Work(context.Background(), job) So(err, ShouldBeNil) diff --git a/templates/project/providers/http/engine.go.tpl b/templates/project/providers/http/engine.go.tpl index d060c5b..b7d445d 100644 --- a/templates/project/providers/http/engine.go.tpl +++ b/templates/project/providers/http/engine.go.tpl @@ -33,13 +33,6 @@ type Service struct { func (svc *Service) listenerConfig() fiber.ListenConfig { listenConfig := fiber.ListenConfig{ EnablePrintRoutes: true, - OnShutdownSuccess: func() { - log.Info("http server shutdown success") - }, - OnShutdownError: func(err error) { - log.Error("http server shutdown error: ", err) - }, - // DisableStartupMessage: true, } @@ -92,6 +85,14 @@ func Provide(opts ...opt.Option) error { TimeZone: "Asia/Shanghai", })) + engine.Hooks().OnPostShutdown(func(err error) error { + if err != nil { + log.Error("http server shutdown error: ", err) + } + log.Info("http server has shutdown success") + return nil + }) + return &Service{ Engine: engine, conf: &config,