[main] deps update

Author: ra9dev

cmd/api.go

@@ -108,15 +108,15 @@ func newHTTPServer(port uint) func(handler http.Handler) *http.Server {
 		shutdownKey := fmt.Sprintf("http:%d", port)
 
 		shutdown.MustAdd(shutdownKey, func(ctx context.Context) {
-			log.NoContext().Infof("Shutting down HTTP on %s...", addr)
+			log.NoContext().Infof("Shutting down HTTP%s...", addr)
 
 			if err := srv.Shutdown(ctx); err != nil {
 				log.NoContext().Errorf("HTTP shutdown failed: %v", err)
 
 				return
 			}
 
-			log.NoContext().Info("HTTP shutdown succeeded!")
+			log.NoContext().Infof("HTTP%s shutdown succeeded!", addr)
 		})
 
 		return &srv
@@ -149,11 +149,11 @@ func newGRPCServer(port uint) *grpc.Server {
 	shutdownKey := fmt.Sprintf("grpc:%d", port)
 
 	shutdown.MustAdd(shutdownKey, func(ctx context.Context) {
-		log.NoContext().Infof("Shutting down GRPC on :%d...", port)
+		log.NoContext().Infof("Shutting down GRPC:%d...", port)
 
 		srv.GracefulStop()
 
-		log.NoContext().Info("GRPC shutdown succeeded!")
+		log.NoContext().Infof("GRPC:%d shutdown succeeded!", port)
 	})
 
 	return srv

cmd/main.go

@@ -13,7 +13,9 @@ import (
 )
 
 func main() {
-	ctx := shutdown.Context()
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
 	rootCmd := &cobra.Command{
 		Use:   "go-template",
 		Short: "Main entry-point command for the application",
@@ -32,17 +34,34 @@ func main() {
 		log.Fatal(ctx, err)
 	}
 
-	defer gracefulShutdown()
-
 	rootCmd.AddCommand(
 		APIServerCMD(cfg),
 	)
 
-	if err = rootCmd.ExecuteContext(shutdown.Context()); err != nil {
-		log.Errorf(ctx, "failed to execute root cmd: %v", err)
+	done := make(chan struct{})
+	gracefulShutdownDone := shutdown.Wait()
+
+	go func() {
+		defer close(done)
+
+		defer cancel()
+
+		if shutdownErr := <-gracefulShutdownDone; shutdownErr != nil {
+			log.NoContext().Errorf("failed to shutdown: %v", err)
+
+			return
+		}
+
+		log.NoContext().Info("Graceful shutdown completed!")
+	}()
+
+	if err = rootCmd.ExecuteContext(ctx); err != nil {
+		log.NoContext().Errorf("failed to execute root cmd: %v", err)
 
 		return
 	}
+
+	<-done
 }
 
 func setupTracing(cfg config.Config) error {
@@ -93,13 +112,3 @@ func setupLogger(cfg config.Config) error {
 
 	return nil
 }
-
-func gracefulShutdown() {
-	if shutdownErr := shutdown.Wait(); shutdownErr != nil {
-		log.NoContext().Error(shutdownErr)
-
-		return
-	}
-
-	log.NoContext().Infof("Shutdown completed in %.1f seconds", shutdown.Timeout().Seconds())
-}

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/go-chi/render v1.0.2
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0
-	github.com/ra9dev/shutdown v1.0.0
+	github.com/ra9dev/shutdown v1.0.2
 	github.com/riandyrn/otelchi v0.5.0
 	github.com/spf13/cobra v1.5.0
 	github.com/spf13/viper v1.12.0

go.sum

@@ -211,6 +211,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/ra9dev/shutdown v1.0.0 h1:ihMXVK+UKYnzsgvCkrzIJihuFbTz80ufjaltIi1b6Yg=
 github.com/ra9dev/shutdown v1.0.0/go.mod h1:kP40t14LY9eFNGai1Y9mkgSomzmT6KHomklgPXeaWFs=
+github.com/ra9dev/shutdown v1.0.2 h1:+E7E3dSI3y8vSMfvxtx2thKbE3T2tEIn/aK1pliEOTA=
+github.com/ra9dev/shutdown v1.0.2/go.mod h1:kP40t14LY9eFNGai1Y9mkgSomzmT6KHomklgPXeaWFs=
 github.com/riandyrn/otelchi v0.5.0 h1:MJgGWsK8678BEgcFK0bXN0KCT+cmZenrLbfwcVdmMno=
 github.com/riandyrn/otelchi v0.5.0/go.mod h1:TdZGrioq34o3UK86q/3v220f4Zv/UOlffx74hSWlZsQ=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=