diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2018-05-02 13:38:16 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2018-05-02 14:29:15 +1200 |
| commit | f380a77deedbc4c11f11f273384d5fdf14d3f4fe (patch) | |
| tree | 2cb91cf83faa58bb921f816996ce5f676dfe406c /mitmproxy/master.py | |
| parent | 2f3ba1f66dca70764f7d081aa6836d34bbe963c8 (diff) | |
| download | mitmproxy-f380a77deedbc4c11f11f273384d5fdf14d3f4fe.tar.gz mitmproxy-f380a77deedbc4c11f11f273384d5fdf14d3f4fe.tar.bz2 mitmproxy-f380a77deedbc4c11f11f273384d5fdf14d3f4fe.zip | |
Remove the tick event
Mitmproxy: the tickless wonder.
Diffstat (limited to 'mitmproxy/master.py')
| -rw-r--r-- | mitmproxy/master.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py index c0f6e86f..20ac6acd 100644 --- a/mitmproxy/master.py +++ b/mitmproxy/master.py @@ -53,7 +53,6 @@ class Master: self.commands = command.CommandManager(self) self.addons = addonmanager.AddonManager(self) self._server = None - self.first_tick = True self.waiting_flows = [] self.log = log.Log(self) @@ -75,19 +74,12 @@ class Master: if self.server: ServerThread(self.server).start() - async def tick(self): - if self.first_tick: - self.first_tick = False - self.addons.trigger("running") - while True: - if self.should_exit.is_set(): - return - self.addons.trigger("tick") - await asyncio.sleep(0.1) + async def running(self): + self.addons.trigger("running") def run_loop(self, loop): self.start() - asyncio.ensure_future(self.tick()) + asyncio.ensure_future(self.running()) exc = None try: |