111

Author: lvan100

gs/app.go

@@ -65,7 +65,7 @@ func (s *AppStarter) stopApp() {
 
 // Run starts the application, optionally runs a user-defined callback,
 // and waits for termination signals (e.g., SIGTERM, Ctrl+C) to trigger graceful shutdown.
-func (s *AppStarter) Run(fn ...func(ctx context.Context) error) {
+func (s *AppStarter) Run(fn ...func() error) {
 
 	// Start application
 	if err := s.startApp(); err != nil {
@@ -76,7 +76,7 @@ func (s *AppStarter) Run(fn ...func(ctx context.Context) error) {
 
 	// Execute user-provided callback after app starts
 	if len(fn) > 0 && fn[0] != nil {
-		if err := fn[0](app.Ctx); err != nil {
+		if err := fn[0](); err != nil {
 			err = util.WrapError(err, "start app failed")
 			log.Errorf(context.Background(), log.TagAppDef, "%s", err)
 			return

gs/gs.go

@@ -280,7 +280,7 @@ func Web(enable bool) *AppStarter {
 }
 
 // Run starts the application with a custom run function.
-func Run(fn ...func(ctx context.Context) error) {
+func Run(fn ...func() error) {
 	new(AppStarter).Run(fn...)
 }
 

gs/internal/gs_app/app.go

@@ -39,7 +39,7 @@ type App struct {
 	P *gs_conf.AppConfig // Application configuration
 
 	exiting atomic.Bool        // Indicates whether the application is shutting down
-	Ctx     context.Context    // Root context for managing cancellation
+	ctx     context.Context    // Root context for managing cancellation
 	cancel  context.CancelFunc // Function to cancel the root context
 	wg      sync.WaitGroup     // WaitGroup to track running jobs and servers
 
@@ -57,7 +57,7 @@ func NewApp() *App {
 	return &App{
 		C:      gs_core.New(),
 		P:      gs_conf.NewAppConfig(),
-		Ctx:    ctx,
+		ctx:    ctx,
 		cancel: cancel,
 	}
 }
@@ -98,7 +98,7 @@ func (app *App) Start() error {
 	if app.EnableJobs {
 		for _, job := range app.Jobs {
 			app.wg.Add(1)
-			goutil.GoFunc(func() {
+			goutil.Go(app.ctx, func(ctx context.Context) {
 				defer app.wg.Done()
 				defer func() {
 					// Handle unexpected panics by shutting down the app
@@ -107,8 +107,8 @@ func (app *App) Start() error {
 						panic(r)
 					}
 				}()
-				if err := job.Run(app.Ctx); err != nil {
-					log.Errorf(context.Background(), log.TagAppDef, "job run error: %v", err)
+				if err := job.Run(ctx); err != nil {
+					log.Errorf(ctx, log.TagAppDef, "job run error: %v", err)
 					app.ShutDown()
 				}
 			})
@@ -121,7 +121,7 @@ func (app *App) Start() error {
 		for _, svr := range app.Servers {
 			sig.Add()
 			app.wg.Add(1)
-			goutil.GoFunc(func() {
+			goutil.Go(app.ctx, func(ctx context.Context) {
 				defer app.wg.Done()
 				defer func() {
 					// Handle server panics by intercepting readiness and shutting down
@@ -133,11 +133,11 @@ func (app *App) Start() error {
 				}()
 				err := svr.ListenAndServe(sig)
 				if err != nil && !errors.Is(err, http.ErrServerClosed) {
-					log.Errorf(context.Background(), log.TagAppDef, "server serve error: %v", err)
+					log.Errorf(ctx, log.TagAppDef, "server serve error: %v", err)
 					sig.Intercept()
 					app.ShutDown()
 				} else {
-					log.Infof(context.Background(), log.TagAppDef, "server closed")
+					log.Infof(ctx, log.TagAppDef, "server closed")
 				}
 			})
 		}
@@ -158,13 +158,13 @@ func (app *App) Start() error {
 // and then gracefully stops all servers and jobs.
 func (app *App) WaitForShutdown() {
 	// Wait until the application context is cancelled (triggered by ShutDown)
-	<-app.Ctx.Done()
+	<-app.ctx.Done()
 
 	// Gracefully shut down all running servers
 	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)
+		goutil.Go(context.Background(), func(ctx context.Context) {
+			if err := svr.Shutdown(ctx); err != nil {
+				log.Errorf(ctx, log.TagAppDef, "shutdown server failed: %v", err)
 			}
 		})
 	}

gs/internal/gs_app/app_test.go

@@ -22,7 +22,6 @@ import (
 	"errors"
 	"net/http"
 	"os"
-	"runtime/debug"
 	"testing"
 	"time"
 
@@ -38,8 +37,8 @@ import (
 var logBuf = &bytes.Buffer{}
 
 func init() {
-	goutil.OnPanic = func(ctx context.Context, r any) {
-		log.Panicf(ctx, log.TagAppDef, "panic: %v\n%s\n", r, debug.Stack())
+	goutil.OnPanic = func(ctx context.Context, r any, stack []byte) {
+		log.Panicf(ctx, log.TagAppDef, "panic: %v\n%s\n", r, stack)
 	}
 }