diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-04-01 11:37:35 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2018-04-01 11:37:35 +1200 |
| commit | 3cc5d81a4a6cdb507b71fce0ce6c2a23fed0c208 (patch) | |
| tree | e539bc868bf58f6fcb8adebcb3ea0928fc845303 /mitmproxy/controller.py | |
| parent | b6d943cfa3a226651e705ff45aa7154010ea29ba (diff) | |
| download | mitmproxy-3cc5d81a4a6cdb507b71fce0ce6c2a23fed0c208.tar.gz mitmproxy-3cc5d81a4a6cdb507b71fce0ce6c2a23fed0c208.tar.bz2 mitmproxy-3cc5d81a4a6cdb507b71fce0ce6c2a23fed0c208.zip | |
asyncio: fix channel interface and tests
We now need to synthesize a tick event when changing addons in tests, because
tick is asynchronously called on the event loop.
Diffstat (limited to 'mitmproxy/controller.py')
| -rw-r--r-- | mitmproxy/controller.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py index 97fb0f51..79b049c9 100644 --- a/mitmproxy/controller.py +++ b/mitmproxy/controller.py @@ -8,8 +8,9 @@ class Channel: The only way for the proxy server to communicate with the master is to use the channel it has been given. """ - def __init__(self, loop, q): + def __init__(self, loop, q, should_exit): self.loop = loop + self.should_exit = should_exit self._q = q def ask(self, mtype, m): |