From cf2a6fb621bf0f835d18399e7b71c082a67e16e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= Date: Thu, 21 May 2020 03:33:11 +0200 Subject: [PATCH] small NimbusState refactoring --- nimbus/nimbus.nim | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/nimbus/nimbus.nim b/nimbus/nimbus.nim index 5be9d4eaa..550def1b4 100644 --- a/nimbus/nimbus.nim +++ b/nimbus/nimbus.nim @@ -27,7 +27,7 @@ const type NimbusState = enum - Starting, Running, Stopping, Stopped + Starting, Running, Stopping NimbusNode = ref object rpcServer*: RpcHttpServer @@ -36,7 +36,6 @@ type proc start(nimbus: NimbusNode) = var conf = getConfiguration() - nimbus.state = Starting ## logging setLogLevel(conf.debug.logLevel) @@ -160,19 +159,18 @@ proc stop*(nimbus: NimbusNode) {.async, gcsafe.} = nimbus.rpcServer.stop() proc process*(nimbus: NimbusNode) = - if nimbus.state == Running: - # Main loop - while nimbus.state == Running: - try: - poll() - except CatchableError as e: - debug "Exception in poll()", exc = e.name, err = e.msg + # Main event loop + while nimbus.state == Running: + try: + poll() + except CatchableError as e: + debug "Exception in poll()", exc = e.name, err = e.msg # Stop loop waitFor nimbus.stop() when isMainModule: - var nimbus = NimbusNode() + var nimbus = NimbusNode(state: Starting) ## Ctrl+C handling proc controlCHandler() {.noconv.} =