Merge pull request #38 from h0n9/develop

Prepare to release v0.0.3
h0n9 · Aug 3, 2023 · 9c1c2fd · 9c1c2fd
2 parents e9d0bdc + f519b85
commit 9c1c2fd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cli/agent/agent.go b/cli/agent/agent.go
@@ -52,7 +52,10 @@ var Cmd = &cobra.Command{
 		ctx, cancel := context.WithCancel(context.Background())
 		logger.Info().Msg("initalized context")
 
-		var grpcServer *grpc.Server = nil
+		var (
+			lakeService *lake.Service = nil
+			grpcServer  *grpc.Server  = nil
+		)
 
 		sigCh := make(chan os.Signal, 1)
 		signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
@@ -64,14 +67,19 @@ var Cmd = &cobra.Command{
 			cancel()
 			if grpcServer != nil {
 				grpcServer.GracefulStop()
+				logger.Info().Msg("gracefully stopped gRPC server")
+			}
+			if lakeService != nil {
+				lakeService.Close()
+				logger.Info().Msg("closed lake service")
 			}
 			wg.Done()
 		}()
 		logger.Info().Msg("listening os signal: SIGINT, SIGTERM")
 
 		grpcServer = grpc.NewServer()
 		logger.Info().Msg("initalized gRPC server")
-		lakeService, err := lake.NewService(
+		lakeService, err = lake.NewService(
 			ctx,
 			&logger,
 			[]byte(seed),

diff --git a/lake/lake.go b/lake/lake.go
@@ -47,7 +47,6 @@ func (service *Service) Close() {
 	if service.relayer != nil {
 		service.relayer.Close()
 	}
-	service.logger.Info().Msg("closed lake service")
 }
 
 func (service *Service) Publish(ctx context.Context, req *pb.PublishReq) (*pb.PublishRes, error) {