aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/dump.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-07-16 10:00:34 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-07-16 10:19:06 +1200
commit5f23d4f5ca49a3f6cfbcfd9f4e444150a25844b0 (patch)
tree8050cfc0a99a383b82fe3e423c9fc3e2ad43b44c /mitmproxy/dump.py
parent5a60f32c5510610935af1549022b3f7948002721 (diff)
downloadmitmproxy-5f23d4f5ca49a3f6cfbcfd9f4e444150a25844b0.tar.gz
mitmproxy-5f23d4f5ca49a3f6cfbcfd9f4e444150a25844b0.tar.bz2
mitmproxy-5f23d4f5ca49a3f6cfbcfd9f4e444150a25844b0.zip
add_event -> add_log throughout project
"Event" is terribly over-loaded in the project, and "log" is straight-forward and self-explanatory.
Diffstat (limited to 'mitmproxy/dump.py')
-rw-r--r--mitmproxy/dump.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/dump.py b/mitmproxy/dump.py
index 6a9bb951..70c9bb53 100644
--- a/mitmproxy/dump.py
+++ b/mitmproxy/dump.py
@@ -97,7 +97,7 @@ class DumpMaster(flow.FlowMaster):
try:
self.load_flows_file(options.rfile)
except exceptions.FlowReadException as v:
- self.add_event("Flow file corrupted.", "error")
+ self.add_log("Flow file corrupted.", "error")
raise DumpError(v)
if self.options.app:
@@ -113,7 +113,7 @@ class DumpMaster(flow.FlowMaster):
except exceptions.FlowReadException as e:
raise DumpError(str(e))
- def add_event(self, e, level="info"):
+ def add_log(self, e, level="info"):
needed = dict(error=0, warn=1, info=2, debug=3).get(level, 2)
if self.options.verbosity >= needed:
self.echo(
@@ -157,7 +157,7 @@ class DumpMaster(flow.FlowMaster):
)
except exceptions.ContentViewException:
s = "Content viewer failed: \n" + traceback.format_exc()
- self.add_event(s, "debug")
+ self.add_log(s, "debug")
type, lines = contentviews.get_content_view(
contentviews.get("Raw"),
message.content,