diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-07-14 18:46:07 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-07-14 19:54:15 +1200 |
| commit | a4127fb6d5f026c015525bab7993bf6f33e16f93 (patch) | |
| tree | aaed1851f42ec3d5c3f0c96f8324fe6575e26c0d /mitmproxy/controller.py | |
| parent | 5b2d1c044a0683444f117d8085e29bb613dbbf9d (diff) | |
| download | mitmproxy-a4127fb6d5f026c015525bab7993bf6f33e16f93.tar.gz mitmproxy-a4127fb6d5f026c015525bab7993bf6f33e16f93.tar.bz2 mitmproxy-a4127fb6d5f026c015525bab7993bf6f33e16f93.zip | |
Add a tick event for addons and scripts, and use it for race-free reload
Diffstat (limited to 'mitmproxy/controller.py')
| -rw-r--r-- | mitmproxy/controller.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py index 72f8e001..d3ae1baa 100644 --- a/mitmproxy/controller.py +++ b/mitmproxy/controller.py @@ -33,6 +33,7 @@ Events = frozenset([ "error", "log", "done", + "tick", "script_change", ]) @@ -108,6 +109,8 @@ class Master(object): self.shutdown() def tick(self, timeout): + with self.handlecontext(): + self.addons("tick") changed = False try: mtype, obj = self.event_queue.get(timeout=timeout) |