diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2018-04-04 14:46:29 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2018-04-07 09:02:10 +1200 |
| commit | 6a08ef465f3af6cb2044baf98279de1071538f5a (patch) | |
| tree | 183c5821a7a5d4debd8bd779c5596c280c48cabc /mitmproxy/master.py | |
| parent | ea213782d8adaa21aa99f2de818172ee872cf3e9 (diff) | |
| download | mitmproxy-6a08ef465f3af6cb2044baf98279de1071538f5a.tar.gz mitmproxy-6a08ef465f3af6cb2044baf98279de1071538f5a.tar.bz2 mitmproxy-6a08ef465f3af6cb2044baf98279de1071538f5a.zip | |
asyncio: remove master.add_log, in favor of a persistent log.Log instance
Diffstat (limited to 'mitmproxy/master.py')
| -rw-r--r-- | mitmproxy/master.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/mitmproxy/master.py b/mitmproxy/master.py index be639dcd..323f73dc 100644 --- a/mitmproxy/master.py +++ b/mitmproxy/master.py @@ -56,6 +56,7 @@ class Master: self._server = None self.first_tick = True self.waiting_flows = [] + self.log = log.Log(self) @property def server(self): @@ -73,7 +74,7 @@ class Master: yield return mitmproxy_ctx.master = self - mitmproxy_ctx.log = log.Log(self) + mitmproxy_ctx.log = self.log mitmproxy_ctx.options = self.options try: yield @@ -82,12 +83,6 @@ class Master: mitmproxy_ctx.log = None mitmproxy_ctx.options = None - def add_log(self, e, level): - """ - level: debug, alert, info, warn, error - """ - self.addons.trigger("log", log.LogEntry(e, level)) - def start(self): self.should_exit.clear() if self.server: |