aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/master.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-05-02 11:20:20 +1200
committerAldo Cortesi <aldo@corte.si>2018-05-02 11:26:40 +1200
commit22a4b1d5d4f315ed013332e4219f105e6d928615 (patch)
treea49eca33bd6082786a7c2757164e2e5ad5a6a035 /mitmproxy/master.py
parente96340843401d677d5e8272d562b48fe4358362a (diff)
downloadmitmproxy-22a4b1d5d4f315ed013332e4219f105e6d928615.tar.gz
mitmproxy-22a4b1d5d4f315ed013332e4219f105e6d928615.tar.bz2
mitmproxy-22a4b1d5d4f315ed013332e4219f105e6d928615.zip
Redesign keepserving
- Instead of listening for a pseudo-event, we periodically check whether client replay, server replay or file reading is active. - Adjust server replay not to use tick. - Adjust readfile to expose a command to check whether reading is in progress.
Diffstat (limited to 'mitmproxy/master.py')
-rw-r--r--mitmproxy/master.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index 7f81d185..c0f6e86f 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -127,10 +127,7 @@ class Master:
"""
if not self.should_exit.is_set():
self.should_exit.set()
- asyncio.run_coroutine_threadsafe(
- self._shutdown(),
- loop = self.channel.loop,
- )
+ asyncio.run_coroutine_threadsafe(self._shutdown(), loop = self.channel.loop)
def _change_reverse_host(self, f):
"""