diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-04-02 11:21:52 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2018-04-02 11:21:52 +1200 |
| commit | 2ac4f9e25514c46f01d1667afa808e274658abaa (patch) | |
| tree | bdd14b74c9605c1fe007798106f5f2d55f01ef75 /mitmproxy/master.py | |
| parent | 2b040ff09374ad50b0878c18296beb4d9147d075 (diff) | |
| download | mitmproxy-2ac4f9e25514c46f01d1667afa808e274658abaa.tar.gz mitmproxy-2ac4f9e25514c46f01d1667afa808e274658abaa.tar.bz2 mitmproxy-2ac4f9e25514c46f01d1667afa808e274658abaa.zip | |
asyncio: shift console over to asyncio eventloop
Diffstat (limited to 'mitmproxy/master.py')
| -rw-r--r-- | mitmproxy/master.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py index b1dd7d52..c22a78e4 100644 --- a/mitmproxy/master.py +++ b/mitmproxy/master.py @@ -42,6 +42,8 @@ class Master: self.event_queue, self.should_exit, ) + asyncio.ensure_future(self.main()) + asyncio.ensure_future(self.tick()) self.options = opts or options.Options() # type: options.Options self.commands = command.CommandManager(self) @@ -114,7 +116,6 @@ class Master: def run(self): self.start() - asyncio.ensure_future(self.main()) asyncio.ensure_future(self.tick()) loop = asyncio.get_event_loop() try: |