used getattr to select exit

This commit is contained in:
Jesson Soto Ventura 2019-11-15 23:22:38 -05:00
parent b3dac13184
commit 5cb1746ef6

View File

@ -11,7 +11,6 @@ import signal
import typing import typing
from mitmproxy.tools import cmdline from mitmproxy.tools import cmdline
from mitmproxy.tools.console.master import ConsoleMaster
from mitmproxy import exceptions, master from mitmproxy import exceptions, master
from mitmproxy import options from mitmproxy import options
from mitmproxy import optmanager from mitmproxy import optmanager
@ -115,10 +114,7 @@ def run(
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
for signame in ('SIGINT', 'SIGTERM'): for signame in ('SIGINT', 'SIGTERM'):
try: try:
if isinstance(master, ConsoleMaster): loop.add_signal_handler(getattr(signal, signame), getattr(master, "prompt_for_exit", master.shutdown))
loop.add_signal_handler(getattr(signal, signame), master.prompt_for_exit)
else:
loop.add_signal_handler(getattr(signal, signame), master.shutdown)
except NotImplementedError: except NotImplementedError:
# Not supported on Windows # Not supported on Windows
pass pass