Set delay to 5sec for max wait before exit

Author: mathoudebine

library/scheduler.py

@@ -125,10 +125,10 @@ def DiskStats():
 @async_job("Queue_Handler")
 @schedule(timedelta(milliseconds=1).total_seconds())
 def QueueHandler():
+    # Do next action waiting in the queue
     global STOPPING
-
     if STOPPING:
-        # Empty the message queue to allow program to exit cleanly
+        # Empty the action queue to allow program to exit cleanly
         while not config.update_queue.empty():
             f, args = config.update_queue.get()
             f(*args)

main.py

@@ -21,20 +21,22 @@
 if __name__ == "__main__":
 
     def sighandler(signum, frame):
-        print(" Caught signal ", str(signum), ", exiting")
+        print(" Caught signal", str(signum), ", exiting")
 
         # Do not stop the program now in case data transmission was in progress
-        # Instead, ask the scheduler to finish its current task before stopping
+        # Instead, ask the scheduler to empty the action queue before stopping
         scheduler.STOPPING = True
 
-        print("Waiting for all pending request to be sent to display...")
+        # Allow 5 seconds max. delay in case scheduler is not responding
+        wait_time = 5
+        print("Waiting for all pending request to be sent to display (%ds max)..." % wait_time)
 
-        # Allow 2 seconds max. delay in case scheduler is not responding
-        wait_time = 2
         while not scheduler.is_queue_empty() and wait_time > 0:
             time.sleep(0.1)
             wait_time = wait_time - 0.1
 
+        print("(%.1fs)" % (5 - wait_time))
+
         # We force the exit to avoid waiting for other scheduled tasks: they may have a long delay!
         try:
             sys.exit(0)