From c416ac051705a2f6a976f6c0015d91b5dbc573b1 Mon Sep 17 00:00:00 2001 From: ThinkChaos Date: Sat, 11 Jan 2020 13:18:54 +0100 Subject: [PATCH] Exit on SIGTERM instead of prompting --- mitmproxy/tools/_main.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py index b98bbe90f..c1dd61795 100644 --- a/mitmproxy/tools/_main.py +++ b/mitmproxy/tools/_main.py @@ -113,12 +113,12 @@ def run( opts.update(**extra(args)) loop = asyncio.get_event_loop() - for signame in ('SIGINT', 'SIGTERM'): - try: - loop.add_signal_handler(getattr(signal, signame), getattr(master, "prompt_for_exit", master.shutdown)) - except NotImplementedError: - # Not supported on Windows - pass + try: + loop.add_signal_handler(signal.SIGINT, getattr(master, "prompt_for_exit", master.shutdown)) + loop.add_signal_handler(signal.SIGTERM, master.shutdown) + except NotImplementedError: + # Not supported on Windows + pass # Make sure that we catch KeyboardInterrupts on Windows. # https://stackoverflow.com/a/36925722/934719