Revert "Register term_handler for all zuul apps"

This reverts commit 00d7ea51fd1633a141b2e97291baa425be1680c8. It
intended to refactor common code paths for signal handling. However in
our dockerized deployment this seems to completely break signal
handling. Thus it needs to be reverted.

Change-Id: Id5731557ff9a363c7a3d9438a8efcd476e38380c

1 files changed, 13 insertions, 1 deletions

diff --git a/zuul/cmd/executor.py b/zuul/cmd/executor.py
index 5b06f0cca..b050a5979 100755
--- a/zuul/cmd/executor.py
+++ b/zuul/cmd/executor.py
@@ -17,6 +17,7 @@
 import logging
 import os
 import sys
+import signal
 import tempfile
 
 import zuul.cmd
@@ -50,6 +51,8 @@ class Executor(zuul.cmd.ZuulDaemonApp):
 
     def exit_handler(self, signum, frame):
         self.executor.stop()
+        self.executor.join()
+        sys.exit(0)
 
     def start_log_streamer(self):
         pipe_read, pipe_write = os.pipe()
@@ -106,7 +109,16 @@ class Executor(zuul.cmd.ZuulDaemonApp):
                                        log_streaming_port=self.finger_port)
         self.executor.start()
 
-        self.executor.join()
+        if self.args.nodaemon:
+            signal.signal(signal.SIGTERM, self.exit_handler)
+            while True:
+                try:
+                    signal.pause()
+                except KeyboardInterrupt:
+                    print("Ctrl + C: asking executor to exit nicely...\n")
+                    self.exit_handler(signal.SIGINT, None)
+        else:
+            self.executor.join()
 
 
 def main():