diff options
Diffstat (limited to 'zuul/cmd/merger.py')
| -rwxr-xr-x | zuul/cmd/merger.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/zuul/cmd/merger.py b/zuul/cmd/merger.py index 8c4798923..390191f4a 100755 --- a/zuul/cmd/merger.py +++ b/zuul/cmd/merger.py @@ -14,7 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -import signal import sys import zuul.cmd @@ -44,8 +43,6 @@ class Merger(zuul.cmd.ZuulDaemonApp): def exit_handler(self, signum, frame): self.merger.stop() - self.merger.join() - sys.exit(0) def run(self): # See comment at top of file about zuul imports @@ -62,16 +59,7 @@ class Merger(zuul.cmd.ZuulDaemonApp): self.connections) self.merger.start() - if self.args.nodaemon: - signal.signal(signal.SIGTERM, self.exit_handler) - while True: - try: - signal.pause() - except KeyboardInterrupt: - print("Ctrl + C: asking merger to exit nicely...\n") - self.exit_handler(signal.SIGINT, None) - else: - self.merger.join() + self.merger.join() def main(): |