#92 Fixes missing trap signal skipping graceful shutdown.

lightstreams-network · Mar 6, 2019 · bb2e47f · bb2e47f
1 parent 2e5c0d6
commit bb2e47f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 26 deletions.
diff --git a/cmd/lightchain/run.go b/cmd/lightchain/run.go
@@ -105,12 +105,20 @@ func runCmd() *cobra.Command {
 			tracerCfg := tracer.NewConfig(shouldTrace, traceLogFilePath)
 			nodeCfg := node.NewConfig(dataDir, consensusCfg, dbCfg, prometheusCfg, tracerCfg)
 
-			n, err := startNode(nodeCfg)
+			n, err := node.NewNode(&nodeCfg)
 			if err != nil {
-				logger.Error(err.Error())
+				logger.Error(fmt.Errorf("lightchain node could not be instantiated: %v", err).Error())
 				os.Exit(1)
 			}
 
+			go func() {
+				logger.Debug("Starting lightchain node...")
+				if err := n.Start(); err != nil {
+					logger.Error(fmt.Errorf("lightchain node could not be started: %v", err).Error())
+					os.Exit(1)
+				}
+			}()
+
 			common.TrapSignal(func() {
 				if err := n.Stop(); err != nil {
 					logger.Error(fmt.Errorf("error stopping lightchain node. %v", err).Error())
@@ -127,20 +135,6 @@ func runCmd() *cobra.Command {
 	return runCmd
 }
 
-func startNode(nodeCfg node.Config) (*node.Node, error) {
-	n, err := node.NewNode(&nodeCfg)
-	if err != nil {
-		return nil, fmt.Errorf("lightchain node could not be instantiated: %v", err)
-	}
-
-	logger.Debug("Starting lightchain node...")
-	if err := n.Start(); err != nil {
-		return nil, fmt.Errorf("lightchain node could not be started: %v", err)
-	}
-
-	return n, nil
-}
-
 func addRunCmdFlags(cmd *cobra.Command) {
 	addDefaultFlags(cmd)
 	addConsensusFlags(cmd)

diff --git a/cmd/lightchain/simulate.go b/cmd/lightchain/simulate.go
@@ -52,12 +52,17 @@ func simulateCmd() *cobra.Command {
 				os.Exit(1)
 			}
 
-			n, err := startNode(nodeCfg)
+			n, err := node.NewNode(&nodeCfg)
 			if err != nil {
 				logger.Error(err.Error())
 				os.Exit(1)
 			}
 
+			if err := n.Start(); err != nil {
+				logger.Error(err.Error())
+				os.Exit(1)
+			}
+
 			tx := simulateTransferTx(nodeCfg)
 
 			n.Stop()

diff --git a/node/node.go b/node/node.go
@@ -57,7 +57,6 @@ func (n *Node) Start() error {
 		return err
 	}
 
-	n.logger.Info("Starting prometheus service...")
 	if err := n.prometheusNode.Start(); err != nil {
 		return err
 	}
@@ -80,11 +79,9 @@ func (n *Node) Stop() error {
 	}
 	n.logger.Info("Database node stopped")
 
-	n.logger.Info("Stopping prometheus service...")
 	if err := n.prometheusNode.Stop(); err != nil {
 		return err
 	}
-	n.logger.Info("Prometheus service stopped")
 
 	return nil
-}
+}
diff --git a/prometheus/node.go b/prometheus/node.go
@@ -37,10 +37,11 @@ func (n *Node) Registry() *prometheus.Registry {
 }
 
 func (n *Node) Start() error {
-	if ! n.cfg.enabled {
-		n.logger.Info("Ignored initialization of prometheus service")
+	if !n.cfg.enabled {
 		return nil
 	}
+
+	n.logger.Info("Starting prometheus node...")
 
 	n.httpSrv = &http.Server{
 		Addr: n.cfg.http.Addr,
@@ -62,14 +63,15 @@ func (n *Node) Start() error {
 }
 
 func (n *Node) Stop() error {
-	if ! n.cfg.enabled {
-		n.logger.Info("Ignored stopping of prometheus service")
+	if !n.cfg.enabled {
 		return nil
 	}
 
+	n.logger.Info("Stopping prometheus node...")
 	if err := n.httpSrv.Shutdown(context.Background()); err != nil {
 		return err
 	}
+	n.logger.Info("Prometheus node stopped")
 
 	return nil
-}
+}