aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
diff options
context:
space:
mode:
authorJesson Soto Ventura <jessonsotoventura@gmail.com>2019-10-31 09:51:50 -0400
committerJesson Soto Ventura <jessonsotoventura@gmail.com>2019-11-14 20:43:27 -0500
commitb3dac1318410c72ea61d9c2c92bb19e68db377fd (patch)
tree2f1b356a44ffad8f1b71626ad3681a949ed51bab /mitmproxy
parentcd660a035f74e00bd94a9b67c240ee44654ce1ce (diff)
downloadmitmproxy-b3dac1318410c72ea61d9c2c92bb19e68db377fd.tar.gz
mitmproxy-b3dac1318410c72ea61d9c2c92bb19e68db377fd.tar.bz2
mitmproxy-b3dac1318410c72ea61d9c2c92bb19e68db377fd.zip
ctrl-c should prompt for an exit
Diffstat (limited to 'mitmproxy')
-rw-r--r--mitmproxy/tools/_main.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py
index a00a3e98..11a87327 100644
--- a/mitmproxy/tools/_main.py
+++ b/mitmproxy/tools/_main.py
@@ -11,6 +11,7 @@ import signal
import typing
from mitmproxy.tools import cmdline
+from mitmproxy.tools.console.master import ConsoleMaster
from mitmproxy import exceptions, master
from mitmproxy import options
from mitmproxy import optmanager
@@ -114,7 +115,10 @@ def run(
loop = asyncio.get_event_loop()
for signame in ('SIGINT', 'SIGTERM'):
try:
- loop.add_signal_handler(getattr(signal, signame), master.shutdown)
+ if isinstance(master, ConsoleMaster):
+ loop.add_signal_handler(getattr(signal, signame), master.prompt_for_exit)
+ else:
+ loop.add_signal_handler(getattr(signal, signame), master.shutdown)
except NotImplementedError:
# Not supported on Windows
pass