refactor(gs_app): wait job exiting

Author: lvan100

gs/internal/gs_app/app.go

@@ -25,7 +25,6 @@ import (
 	"sync"
 	"sync/atomic"
 	"syscall"
-	"time"
 
 	"github.com/go-spring/log"
 	"github.com/go-spring/spring-core/conf"
@@ -55,8 +54,6 @@ type App struct {
 
 	EnableJobs    bool `value:"${spring.app.enable-jobs:=true}"`
 	EnableServers bool `value:"${spring.app.enable-servers:=true}"`
-
-	ShutDownTimeout time.Duration `value:"${spring.app.shutdown-timeout:=15s}"`
 }
 
 // NewApp creates and initializes a new application instance.
@@ -137,7 +134,9 @@ func (app *App) Start() error {
 	// runs all jobs
 	if app.EnableJobs {
 		for _, job := range app.Jobs {
+			app.wg.Add(1)
 			goutil.GoFunc(func() {
+				defer app.wg.Done()
 				defer func() {
 					if r := recover(); r != nil {
 						app.ShutDown()
@@ -188,29 +187,16 @@ func (app *App) Start() error {
 // Stop gracefully shuts down the application, ensuring all servers and
 // resources are properly closed.
 func (app *App) Stop() {
-	ctx, cancel := context.WithTimeout(context.Background(), app.ShutDownTimeout)
-	defer cancel()
-
-	waitChan := make(chan struct{})
-	goutil.GoFunc(func() {
-		for _, svr := range app.Servers {
-			goutil.GoFunc(func() {
-				if err := svr.Shutdown(ctx); err != nil {
-					log.Errorf(context.Background(), log.TagAppDef, "shutdown server failed: %v", err)
-				}
-			})
-		}
-		app.wg.Wait()
-		app.C.Close()
-		waitChan <- struct{}{}
-	})
-
-	select {
-	case <-waitChan:
-		log.Infof(context.Background(), log.TagAppDef, "shutdown complete")
-	case <-ctx.Done():
-		log.Infof(context.Background(), log.TagAppDef, "shutdown timeout")
+	for _, svr := range app.Servers {
+		goutil.GoFunc(func() {
+			if err := svr.Shutdown(app.ctx); err != nil {
+				log.Errorf(context.Background(), log.TagAppDef, "shutdown server failed: %v", err)
+			}
+		})
 	}
+	app.wg.Wait()
+	app.C.Close()
+	log.Infof(context.Background(), log.TagAppDef, "shutdown complete")
 }
 
 // Exiting returns a boolean indicating whether the application is exiting.

gs/internal/gs_app/app_test.go

@@ -232,7 +232,7 @@ func TestApp(t *testing.T) {
 
 			app.C.Object(r).AsJob().Name("j1")
 		}
-		j2Wait := make(chan struct{})
+		j2Wait := make(chan struct{}, 1)
 		{
 			m := gsmock.NewManager()
 			r := gs.NewJobMockImpl(m)
@@ -272,7 +272,6 @@ func TestApp(t *testing.T) {
 		}
 		go func() {
 			time.Sleep(50 * time.Millisecond)
-			assert.That(t, app.ShutDownTimeout).Equal(time.Second * 15)
 			assert.That(t, app.EnableJobs).True()
 			assert.That(t, app.EnableServers).True()
 			assert.That(t, len(app.Jobs)).Equal(2)
@@ -287,33 +286,6 @@ func TestApp(t *testing.T) {
 		assert.ThatString(t, logBuf.String()).Contains("shutdown complete")
 	})
 
-	t.Run("shutdown timeout", func(t *testing.T) {
-		Reset()
-		t.Cleanup(Reset)
-
-		_ = gs_conf.SysConf.Set("spring.app.shutdown-timeout", "10ms")
-		app := NewApp()
-
-		m := gsmock.NewManager()
-		r := gs.NewServerMockImpl(m)
-		r.MockShutdown().ReturnDefault()
-		r.MockListenAndServe().Handle(func(sig gs.ReadySignal) error {
-			<-sig.TriggerAndWait()
-			time.Sleep(time.Second)
-			return nil
-		})
-
-		app.C.Object(r).AsServer()
-		go func() {
-			time.Sleep(50 * time.Millisecond)
-			app.ShutDown()
-		}()
-		err := app.Run()
-		assert.That(t, err).Nil()
-		time.Sleep(50 * time.Millisecond)
-		assert.ThatString(t, logBuf.String()).Contains("shutdown timeout")
-	})
-
 	t.Run("shutdown error", func(t *testing.T) {
 		Reset()
 		t.Cleanup(Reset)