Added graceful shutdown

Author: pmmiranda

nimbus/consensus/consensus_layer.nim

@@ -22,6 +22,9 @@ import
 logScope:
   topics = "Consensus layer"
 
+proc shutdownConsensus*() =
+  bnStatus = BeaconNodeStatus.Stopping
+
 proc makeConfig*(
     cmdCommandList: seq[string], ConfType: type
 ): Result[ConfType, string] =

nimbus/execution/execution_layer.nim

@@ -20,6 +20,11 @@ import
 logScope:
   topics = "Execution layer"
 
+var nimbusHandler = NimbusNode()
+
+proc shutdownExecution*() =
+  nimbusHandler.state = NimbusState.Stopping
+
 ## Execution Layer handler
 proc executionLayerHandler*(channel: ptr Channel[pointer]) =
   var p: pointer
@@ -38,7 +43,7 @@ proc executionLayerHandler*(channel: ptr Channel[pointer]) =
 
   try:
     {.gcsafe.}:
-      var nimbusHandler = NimbusNode(state: NimbusState.Starting, ctx: newEthContext())
+      nimbusHandler = NimbusNode(state: NimbusState.Starting, ctx: newEthContext())
       let conf = makeConfig(parametersList)
       nimbusHandler.run(conf)
   except [CatchableError, OSError, IOError, CancelledError, MetricsError]:

nimbus/nimbus.nim

@@ -81,16 +81,11 @@ proc startService(nimbus: var Nimbus, service: var NimbusService) =
 ## Gracefully exits all services
 proc monitorServices(nimbus: Nimbus) =
   for service in nimbus.serviceList:
-    if service.serviceHandler.running():
-      joinThread(service.serviceHandler)
-      info "Exited service ", service = service.name
+    joinThread(service.serviceHandler)
+    info "Exited service ", service = service.name
 
   notice "Exited all services"
 
-# ------------------------------------------------------------------------------
-# Public
-# ------------------------------------------------------------------------------
-
 # aux function to prepare arguments and options for eth1 and eth2
 func addArg(
     paramTable: var NimbusConfigTable, cmdKind: CmdLineKind, key: string, arg: string
@@ -110,6 +105,22 @@ func addArg(
 
   paramTable[newKey] = newArg
 
+proc controlCHandler() {.noconv.} =
+  when defined(windows):
+    # workaround for https://github.com/nim-lang/Nim/issues/4057
+    try:
+      setupForeignThreadGc()
+    except NimbusServiceError as exc:
+      raiseAssert exc.msg # shouldn't happen
+
+  notice "\tCtrl+C pressed. Shutting down services ..."
+  shutdownExecution()
+  shutdownConsensus()
+
+# ------------------------------------------------------------------------------
+# Public
+# ------------------------------------------------------------------------------
+
 # Setup services
 proc setup*(nimbus: var Nimbus) =
   let
@@ -158,6 +169,10 @@ proc run*(nimbus: var Nimbus) =
     fatal "error starting service:", msg = e.msg
     quit QuitFailure
 
+  # handling Ctrl+C signal
+  # note: do not move. Both execution and consensus clients create these handlers.
+  setControlCHook(controlCHandler)
+
   ## wait for shutdown
   nimbus.monitorServices()
 
@@ -167,22 +182,7 @@ when isMainModule:
 
   setupFileLimits()
 
-  var nimbus: Nimbus = Nimbus.new
-
-  ## Graceful shutdown by handling of Ctrl+C signal
-  proc controlCHandler() {.noconv.} =
-    when defined(windows):
-      # workaround for https://github.com/nim-lang/Nim/issues/4057
-      try:
-        setupForeignThreadGc()
-      except NimbusServiceError as exc:
-        raiseAssert exc.msg # shouldn't happen
-
-    notice "\tCtrl+C pressed. Shutting down services ..."
-    quit 0
-
-  setControlCHook(controlCHandler)
-
+  var nimbus = Nimbus()
   nimbus.setup()
   nimbus.run()