aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/master.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2018-04-04 07:28:43 +1200
committerAldo Cortesi <aldo@corte.si>2018-04-07 09:02:10 +1200
commit80f2bac356dd8abc50a28e4c8d9951a60979d168 (patch)
tree1d60ebbf513b256bac0049253b6dd942c8bd9947 /mitmproxy/master.py
parent0fa1280daa94729defa8411d86266bd2b52ad0b6 (diff)
downloadmitmproxy-80f2bac356dd8abc50a28e4c8d9951a60979d168.tar.gz
mitmproxy-80f2bac356dd8abc50a28e4c8d9951a60979d168.tar.bz2
mitmproxy-80f2bac356dd8abc50a28e4c8d9951a60979d168.zip
asyncio: move log mechanism onto the event loop
Logs are now asynchronous, with a log entry pushed onto the event loop for handling. To support this, the test mechanism grows an await_log method that waits for a log entry to appear.
Diffstat (limited to 'mitmproxy/master.py')
-rw-r--r--mitmproxy/master.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py
index b233aa97..be639dcd 100644
--- a/mitmproxy/master.py
+++ b/mitmproxy/master.py
@@ -49,7 +49,6 @@ class Master:
asyncio.get_event_loop(),
self.should_exit,
)
- asyncio.ensure_future(self.tick())
self.options = opts or options.Options() # type: options.Options
self.commands = command.CommandManager(self)