Fix shutdown and logging

Author: altafan

server/cmd/arkd/main.go

@@ -76,7 +76,7 @@ func mainAction(_ *cli.Context) error {
 
 	log.Infof("Ark Server config: %+v", cfg)
 
-	log.Info("starting service...")
+	log.Debug("starting service...")
 	if err := svc.Start(); err != nil {
 		return err
 	}
@@ -87,7 +87,7 @@ func mainAction(_ *cli.Context) error {
 	signal.Notify(sigChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT, os.Interrupt)
 	<-sigChan
 
-	log.Info("shutting down service...")
+	log.Debug("shutting down service...")
 	log.Exit(0)
 
 	return nil

server/internal/core/application/service.go

@@ -198,12 +198,12 @@ func NewService(
 }
 
 func (s *covenantlessService) Start() error {
-	log.Debug("starting sweeper service")
+	log.Debug("starting sweeper service...")
 	if err := s.sweeper.start(); err != nil {
 		return err
 	}
 
-	log.Debug("starting app service")
+	log.Debug("starting app service...")
 	go s.start()
 	return nil
 }

server/internal/interface/grpc/handlers/arkservice.go

@@ -32,27 +32,17 @@ type handler struct {
 	eventsListenerHandler       *broker[*arkv1.GetEventStreamResponse]
 	transactionsListenerHandler *broker[*arkv1.GetTransactionsStreamResponse]
 	addressSubsHandler          *broker[*arkv1.SubscribeForAddressResponse]
-
-	stopCh                  <-chan struct{}
-	stopRoundEventsCh       chan struct{}
-	stopTransactionEventsCh chan struct{}
-	stopAddressEventsCh     chan struct{}
 }
 
-func NewHandler(version string, service application.Service, stopCh <-chan struct{}) service {
+func NewHandler(version string, service application.Service) service {
 	h := &handler{
 		version:                     version,
 		svc:                         service,
 		eventsListenerHandler:       newBroker[*arkv1.GetEventStreamResponse](),
 		transactionsListenerHandler: newBroker[*arkv1.GetTransactionsStreamResponse](),
 		addressSubsHandler:          newBroker[*arkv1.SubscribeForAddressResponse](),
-		stopCh:                      stopCh,
-		stopRoundEventsCh:           make(chan struct{}, 1),
-		stopTransactionEventsCh:     make(chan struct{}, 1),
-		stopAddressEventsCh:         make(chan struct{}, 1),
 	}
 
-	go h.listenToStop()
 	go h.listenToEvents()
 	go h.listenToTxEvents()
 
@@ -369,8 +359,6 @@ func (h *handler) GetEventStream(
 
 	for {
 		select {
-		case <-h.stopRoundEventsCh:
-			return nil
 		case <-stream.Context().Done():
 			return nil
 		case ev := <-listener.ch:
@@ -521,8 +509,8 @@ func (h *handler) GetTransactionsStream(
 
 	for {
 		select {
-		case <-h.stopTransactionEventsCh:
-			return nil
+		// case <-h.stopTransactionEventsCh:
+		// 	return nil
 		case <-stream.Context().Done():
 			return nil
 		case ev := <-listener.ch:
@@ -555,8 +543,6 @@ func (h *handler) SubscribeForAddress(
 
 	for {
 		select {
-		case <-h.stopAddressEventsCh:
-			return nil
 		case <-stream.Context().Done():
 			return nil
 		case ev := <-listener.ch:
@@ -567,14 +553,6 @@ func (h *handler) SubscribeForAddress(
 	}
 }
 
-func (h *handler) listenToStop() {
-	<-h.stopCh
-	h.stopRoundEventsCh <- struct{}{}
-	h.stopTransactionEventsCh <- struct{}{}
-	h.stopAddressEventsCh <- struct{}{}
-
-}
-
 // listenToEvents forwards events from the application layer to the set of listeners
 func (h *handler) listenToEvents() {
 	channel := h.svc.GetEventsChannel(context.Background())

server/internal/interface/grpc/service.go

@@ -48,8 +48,6 @@ type service struct {
 	grpcServer   *grpc.Server
 	macaroonSvc  *macaroons.Service
 	otelShutdown func(context.Context) error
-
-	stopCh chan (struct{})
 }
 
 func NewService(
@@ -96,16 +94,16 @@ func NewService(
 		log.Debugf("generated TLS key pair at path: %s", svcConfig.tlsDatadir())
 	}
 
-	stopCh := make(chan struct{}, 1)
-
-	return &service{version, svcConfig, appConfig, nil, nil, macaroonSvc, nil, stopCh}, nil
+	return &service{version, svcConfig, appConfig, nil, nil, macaroonSvc, nil}, nil
 }
 
 func (s *service) Start() error {
 	withoutAppSvc := false
 	if err := s.start(withoutAppSvc); err != nil {
 		return err
 	}
+	log.Infof("started listening at %s", s.config.address())
+
 	if s.appConfig.UnlockerService() != nil {
 		return s.autoUnlock()
 	}
@@ -120,6 +118,7 @@ func (s *service) Stop() {
 			log.Errorf("failed to shutdown otel: %s", err)
 		}
 	}
+	log.Info("shutdown service")
 }
 
 func (s *service) start(withAppSvc bool) error {
@@ -147,23 +146,21 @@ func (s *service) start(withAppSvc bool) error {
 		// nolint:all
 		go s.server.ListenAndServeTLS("", "")
 	}
-	log.Infof("started listening at %s", s.config.address())
 
 	return nil
 }
 
 func (s *service) stop(withAppSvc bool) {
 	if withAppSvc {
-		s.stopCh <- struct{}{}
 		appSvc, _ := s.appConfig.AppService()
 		if appSvc != nil {
 			appSvc.Stop()
 			log.Info("stopped app service")
 		}
+		s.grpcServer.Stop()
 	}
-	//nolint:all
+	// nolint
 	s.server.Shutdown(context.Background())
-	log.Info("stopped grpc server")
 }
 
 func (s *service) newServer(tlsConfig *tls.Config, withAppSvc bool) error {
@@ -201,7 +198,7 @@ func (s *service) newServer(tlsConfig *tls.Config, withAppSvc bool) error {
 			return err
 		}
 		appSvc = svc
-		appHandler := handlers.NewHandler(s.version, appSvc, s.stopCh)
+		appHandler := handlers.NewHandler(s.version, appSvc)
 		indexerSvc, err := s.appConfig.IndexerService()
 		if err != nil {
 			return err
@@ -309,6 +306,7 @@ func (s *service) newServer(tlsConfig *tls.Config, withAppSvc bool) error {
 		httpServerHandler = h2c.NewHandler(httpServerHandler, &http2.Server{})
 	}
 
+	s.grpcServer = grpcServer
 	s.server = &http.Server{
 		Addr:      s.config.address(),
 		Handler:   httpServerHandler,