111

Author: lvan100

gs/internal/gs_app/app.go

@@ -145,10 +145,10 @@ func (app *App) Start() error {
 		// Wait for all servers to be ready
 		sig.Wait()
 		if sig.Intercepted() {
-			log.Infof(context.Background(), log.TagAppDef, "server intercepted")
+			log.Infof(app.ctx, log.TagAppDef, "server intercepted")
 			return util.FormatError(nil, "server intercepted")
 		}
-		log.Infof(context.Background(), log.TagAppDef, "ready to serve requests")
+		log.Infof(app.ctx, log.TagAppDef, "ready to serve requests")
 		sig.Close()
 	}
 	return nil
@@ -162,15 +162,15 @@ func (app *App) WaitForShutdown() {
 
 	// Gracefully shut down all running servers
 	for _, svr := range app.Servers {
-		goutil.Go(context.Background(), func(ctx context.Context) {
-			if err := svr.Shutdown(ctx); err != nil {
+		goutil.Go(app.ctx, func(ctx context.Context) {
+			if err := svr.Shutdown(context.Background()); err != nil {
 				log.Errorf(ctx, log.TagAppDef, "shutdown server failed: %v", err)
 			}
 		})
 	}
 	app.wg.Wait()
 	app.C.Close()
-	log.Infof(context.Background(), log.TagAppDef, "shutdown complete")
+	log.Infof(app.ctx, log.TagAppDef, "shutdown complete")
 }
 
 // Exiting returns whether the application is currently in the process of shutting down.
@@ -182,7 +182,7 @@ func (app *App) Exiting() bool {
 // setting the exiting flag and cancelling the root context.
 func (app *App) ShutDown() {
 	if app.exiting.CompareAndSwap(false, true) {
-		log.Infof(context.Background(), log.TagAppDef, "shutting down")
+		log.Infof(app.ctx, log.TagAppDef, "shutting down")
 		app.cancel()
 	}
 }