[scripts] Ignore further signals in case of a forced stop

beat/web/scripts/process.py

@@ -116,19 +116,17 @@ def main(user_input=None):
 
     # installs SIGTERM handler
     def handler(signum, frame):
+        #ignore further signals
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+
         logger.info("Signal %d caught, terminating...", signum)
         stop()
+
     signal.signal(signal.SIGTERM, handler)
     signal.signal(signal.SIGINT, handler)
 
-    try:
-
-        split.process(
-            execute=arguments['<execute>'],
-            cpulimit=arguments['--cpulimit'],
-            )
-
-    except KeyboardInterrupt:
-
-        logger.info("CTRL-c caught, terminating...")
-        stop()
+    split.process(
+        execute=arguments['<execute>'],
+        cpulimit=arguments['--cpulimit'],
+        )

beat/web/scripts/scheduler.py

@@ -89,9 +89,14 @@ def main(user_input=None):
 
     # installs SIGTERM handler
     def handler(signum, frame):
+        #ignore further signals
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+
         logger.info("Signal %d caught, terminating...", signum)
         global stop
         stop = True
+
     signal.signal(signal.SIGTERM, handler)
     signal.signal(signal.SIGINT, handler)
 

beat/web/scripts/worker.py

@@ -101,9 +101,14 @@ def main(user_input=None):
 
     # installs SIGTERM handler
     def handler(signum, frame):
+        #ignore further signals
+        signal.signal(signal.SIGTERM, signal.SIG_IGN)
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+
         logger.info("Signal %d caught, terminating...", signum)
         global stop
         stop = True
+
     signal.signal(signal.SIGTERM, handler)
     signal.signal(signal.SIGINT, handler)