diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-10-04 13:00:15 +1100 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-10-04 13:00:15 +1100 |
commit | 7fe09f4d26e604db9d3e7f9868b3f0da0b3a6406 (patch) | |
tree | 9749b5b1477eb8638d2e649328583af59d094b8e /mitmproxy/controller.py | |
parent | 2bd868662937b504cccd825e9e24e3cb6a142708 (diff) | |
download | mitmproxy-7fe09f4d26e604db9d3e7f9868b3f0da0b3a6406.tar.gz mitmproxy-7fe09f4d26e604db9d3e7f9868b3f0da0b3a6406.tar.bz2 mitmproxy-7fe09f4d26e604db9d3e7f9868b3f0da0b3a6406.zip |
Consolidate logging
- Make log event handler work
- Move terminal event log into an addon
- Clean various log related errors and duplications
Diffstat (limited to 'mitmproxy/controller.py')
-rw-r--r-- | mitmproxy/controller.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/mitmproxy/controller.py b/mitmproxy/controller.py index 51a9b146..1a8801e1 100644 --- a/mitmproxy/controller.py +++ b/mitmproxy/controller.py @@ -28,21 +28,26 @@ Events = frozenset([ "requestheaders", "response", "responseheaders", + "error", "websocket_handshake", "next_layer", - "error", - "log", - - "start", "configure", "done", + "log", + "start", "tick", ]) +class LogEntry(object): + def __init__(self, msg, level): + self.msg = msg + self.level = level + + class Log(object): def __init__(self, master): self.master = master @@ -90,11 +95,16 @@ class Master(object): mitmproxy_ctx.master = None mitmproxy_ctx.log = None + def tell(self, mtype, m): + m.reply = DummyReply() + self.event_queue.put((mtype, m)) + def add_log(self, e, level): """ level: debug, info, warn, error """ - pass + with self.handlecontext(): + self.addons("log", LogEntry(e, level)) def add_server(self, server): # We give a Channel to the server which can be used to communicate with the master |