diff options
Diffstat (limited to 'zuul/cmd/executor.py')
| -rwxr-xr-x | zuul/cmd/executor.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/zuul/cmd/executor.py b/zuul/cmd/executor.py index c600dc96d..bf85650cd 100755 --- a/zuul/cmd/executor.py +++ b/zuul/cmd/executor.py @@ -19,7 +19,6 @@ import logging import os import pwd import sys -import signal import tempfile import zuul.cmd @@ -53,8 +52,6 @@ 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() @@ -130,16 +127,7 @@ class Executor(zuul.cmd.ZuulDaemonApp): log_streaming_port=self.finger_port) self.executor.start() - 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() + self.executor.join() def main(): |