fix: support graceful shutdown (#230)

api/modules.go

@@ -2,6 +2,7 @@ package api
 
 import (
 	"context"
+	"errors"
 	"net"
 	"net/http"
 
@@ -55,15 +56,15 @@ func RunAPI(lc fx.Lifecycle, jwtCli *jwt.Client, lst net.Listener, log *log.Logg
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
 			go func() {
-				log.Info("Start rpcserver ", lst.Addr())
-				if err := apiserv.Serve(lst); err != nil {
-					log.Errorf("Start rpcserver failed: %v", err)
+				log.Info("start rpcserver ", lst.Addr())
+				if err := apiserv.Serve(lst); err != nil && !errors.Is(err, http.ErrServerClosed) {
+					log.Errorf("start rpcserver failed: %v", err)
 				}
 			}()
 			return nil
 		},
 		OnStop: func(ctx context.Context) error {
-			return lst.Close()
+			return apiserv.Shutdown(ctx)
 		},
 	})
 	return nil

main.go

@@ -231,7 +231,6 @@ func runAction(ctx *cli.Context) error {
 	}
 	lst := manet.NetListener(apiListener)
 
-	shutdownChan := make(chan struct{})
 	provider := fx.Options(
 		fx.Logger(fxLogger{log}),
 		// prover
@@ -246,7 +245,6 @@ func runAction(ctx *cli.Context) error {
 		fx.Provide(func() filestore.FSRepo {
 			return fsRepo
 		}),
-		fx.Supply((ShutdownChan)(shutdownChan)),
 
 		fx.Provide(service.NewMessageState),
 		// db
@@ -281,21 +279,32 @@ func runAction(ctx *cli.Context) error {
 	app := fx.New(provider, invoker, apiOption)
 	if err := app.Start(ctx.Context); err != nil {
 		// comment fx.NopLogger few lines above for easier debugging
-		return fmt.Errorf("starting node: %w", err)
+		return fmt.Errorf("starting app: %w", err)
 	}
 
+	shutdownChan := make(chan struct{})
+	// wait for exit to complete
+	finishCh := make(chan struct{})
 	go func() {
 		<-shutdownChan
+
 		log.Warn("received shutdown")
 
 		log.Warn("Shutting down...")
 		if err := app.Stop(ctx.Context); err != nil {
 			log.Errorf("graceful shutting down failed: %s", err)
 		}
-		log.Warn("Graceful shutdown successful")
+		log.Info("Graceful shutdown successful")
+
+		close(finishCh)
 	}()
 
 	<-app.Done()
+
+	shutdownChan <- struct{}{}
+
+	<-finishCh
+
 	return nil
 }