diff options
| author | Jesson Soto Ventura <jessonsotoventura@gmail.com> | 2019-11-15 23:22:38 -0500 |
|---|---|---|
| committer | Jesson Soto Ventura <jessonsotoventura@gmail.com> | 2019-11-15 23:22:38 -0500 |
| commit | 5cb1746ef667ff4a4c1426c959d6ce6a34d74540 (patch) | |
| tree | e1988b9a556b50baa3fd80ff5a751a7de305a5e7 | |
| parent | b3dac1318410c72ea61d9c2c92bb19e68db377fd (diff) | |
| download | mitmproxy-5cb1746ef667ff4a4c1426c959d6ce6a34d74540.tar.gz mitmproxy-5cb1746ef667ff4a4c1426c959d6ce6a34d74540.tar.bz2 mitmproxy-5cb1746ef667ff4a4c1426c959d6ce6a34d74540.zip | |
used getattr to select exit
| -rw-r--r-- | mitmproxy/tools/_main.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mitmproxy/tools/_main.py b/mitmproxy/tools/_main.py index 11a87327..0163e8d3 100644 --- a/mitmproxy/tools/_main.py +++ b/mitmproxy/tools/_main.py @@ -11,7 +11,6 @@ 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 @@ -115,10 +114,7 @@ def run( loop = asyncio.get_event_loop() for signame in ('SIGINT', 'SIGTERM'): try: - 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) + loop.add_signal_handler(getattr(signal, signame), getattr(master, "prompt_for_exit", master.shutdown)) except NotImplementedError: # Not supported on Windows pass |