aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-03-18 17:19:44 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-03-18 17:19:44 +0100
commitce38a17893791944fb8b4f589e7ce00d79b8ced0 (patch)
treea26c992e1011cab0558efa389dee561bcf694d62 /libmproxy/flow.py
parentc07cd857a76db5a4d9dbfe46abc84bb6c20088f1 (diff)
parent843b2e28bc4fcadb854b4b50c2f56a67bf63866a (diff)
downloadmitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.tar.gz
mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.tar.bz2
mitmproxy-ce38a17893791944fb8b4f589e7ce00d79b8ced0.zip
Merge pull request #238 from mitmproxy/log_levels
Log Levels
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index b72a754c..a440b850 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -480,7 +480,7 @@ class FlowMaster(controller.Master):
def add_event(self, e, level="info"):
"""
- level: info, error
+ level: debug, info, error
"""
pass
@@ -659,6 +659,10 @@ class FlowMaster(controller.Master):
if block:
rt.join()
+ def handle_log(self, l):
+ self.add_event(l.msg, l.level)
+ l.reply()
+
def handle_clientconnect(self, cc):
self.run_script_hook("clientconnect", cc)
cc.reply()