feat: implement daemon behaviour

Author: nampereira

config/arena0/settings.yaml

@@ -11,7 +11,7 @@ runtime:
   namespace: public
   #uuid: # leave blank to generate a new uuid; or set a fixed uuid value
   uuid: cb65196b-0537-4364-939a-87d004babd4c # this would make the runtime have a fixed uuuid
-  reg_attempts: 1 # -1 = skip registration; 0 = infinite
+  reg_attempts: -1 # -1 = skip registration; 0 = infinite
   reg_timeout_seconds: 5
   reg_fail_error: false
   max_nmodules: 100

config/arenaxr/settings.yaml

@@ -11,7 +11,7 @@ runtime:
   namespace: public  
   #uuid: # leave blank to generate a new uuid; or set a fixed uuid value
   uuid: cb65196b-0537-4364-939a-87d004babd4c # this would make the runtime have a fixed uuuid
-  reg_attempts: 1 # -1 = skip registration; 0 = infinite
+  reg_attempts: -1 # -1 = skip registration; 0 = infinite
   reg_timeout_seconds: 5
   reg_fail_error: false
   max_nmodules: 100

config/settings.yaml

@@ -11,7 +11,7 @@ runtime:
   namespace: public # a namespace your runtime can publish registration, keepalives, errors to; defaults to 'public' if not given
   #uuid: # leave blank to generate a new uuid; or set a fixed uuid value
   uuid: 0b99e423-e94e-435d-8e75-a3a3bf19a1c8 # this would make the runtime have a fixed uuuid
-  reg_attempts: 0 # -1 = skip registration; 0 = infinite
+  reg_attempts: -1 # -1 = skip registration; 0 = infinite
   reg_timeout_seconds: 5
   reg_fail_error: false # registration failure causes the runtime to exit  
   max_nmodules: 100

src/main.py

@@ -8,6 +8,7 @@
 import logzero
 from logzero import logger
 import time
+from threading import Event
 
 import release
 from common.config import settings
@@ -38,13 +39,17 @@ def main(args):
     # pass runtime mngr as pubsub handler to mqtt client
     mqttc = MQTTListner(rtmngr, **settings.get('mqtt'), error_topic=settings.topics.runtimes)
 
-    # some time to init (just so following message does not appear in the middle of init log)
-    time.sleep(2)
-    
-    while True:
-        choice = input("\nEnter Q to quit.\n")
-        if choice.lower() == "q":
-            break
+    # wait for init to be done
+    rtmngr.wait_init()
+
+    if args.daemon:
+        print("Running as a daemon...")
+        Event().wait()
+    else:
+        while True:
+            choice = input("\nEnter Q to quit.\n")
+            if choice.lower() == "q":
+                break
 
 if __name__ == "__main__":
     """ This is executed when run from the command line """

src/runtime/runtime_mngr.py

@@ -29,10 +29,12 @@ def __init__(self, **kwargs):
         self.__lastwill_msg = None
         self.__conn_event = threading.Event()
         self.__reg_event = threading.Event()
+        self.__init_done_event = threading.Event()
         self.__ka_exit = threading.Event()
         self.__pending_delete_msgs: Dict[str, PubsubMessage] = {} # dictionary messages waiting module exit notification
         self.__exited=False;
 
+
         self.__rt = Runtime(topics=kwargs.get('topics', settings.get('topics')), **kwargs.get('runtime', settings.get('runtime')))
 
         # register exit handler to send delete runtime request
@@ -94,7 +96,12 @@ def pubsub_connected(self, client):
     def pubsub_error(self, desc, data):
         logger.error(desc, data)
 
-    def wait_reg(self, timeout_secs):
+    def wait_init(self, timeout_secs=15):
+        evt_flag = self.__init_done_event.wait(timeout_secs)
+        if not evt_flag:
+            raise RuntimeException("timeout waiting for init.", f"Runtime init failed after {timeout_secs} secs")
+
+    def __wait_reg(self, timeout_secs=10):
         evt_flag = self.__conn_event.wait(10)
         if not evt_flag:
             raise RuntimeException("timeout waiting for MQTT connection.", "Could not connect.") 
@@ -124,17 +131,16 @@ def __register_runtime_send(self, reg_msg, timeout_secs, reg_attempts, reg_fail_
            until register event is set"""
 
         reg_count = reg_attempts
+        if reg_attempts == 0: reg_count = -1    
         reg_flag = False
         while True:
-            if reg_count > 0: 
-                logger.info("Runtime attempting to register...");
-                self.__pubsub_client.message_publish(reg_msg)
-                reg_flag = self.wait_reg(timeout_secs)
-                if reg_flag == True: break # event is set; registration response received
-                reg_count = reg_count - 1
-                if reg_count == 0: break
+            logger.info(f"Runtime attempting to register... {reg_count}");
+            self.__pubsub_client.message_publish(reg_msg)
+            reg_flag = self.__wait_reg(timeout_secs)
+            if reg_flag == True: break # event is set; registration response received
+            if reg_count > 0: reg_count = reg_count - 1
+            if reg_count == 0: break
 
-        
         if not reg_flag:
             if reg_fail_error: raise RuntimeException("runtime registration failed.", "Could not register runtime after {} attempts.".format(reg_attempts))
             else: 
@@ -159,7 +165,9 @@ def __register_runtime_done(self):
                 args=(ka_interval_sec,))
             self.__ka_thread.start()
 
-        logger.info("Runtime registration done.")
+        # flag init is done
+        logger.info("Runtime registration done (or skiped).")        
+        self.__init_done_event.set()
 
     def reg(self, decoded_msg):
         msg_data = decoded_msg.get('data')

start-runtime1.sh

@@ -5,5 +5,7 @@
 docker pull slframework/slruntime-python-runner-repo-head
 docker pull slframework/slruntime-python-runner
 
+./stop-runtime1.sh > /dev/null
+
 TARGET="${1:-arenaxr}"
 screen -L -Logfile slruntime1.log -S slruntime1 -dm bash -c "make config/${TARGET}"