Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

add_event -> add_log throughout project

Browse Source 
"Event" is terribly over-loaded in the project, and "log" is straight-forward
and self-explanatory.
This commit is contained in:
Aldo Cortesi 2016-07-16 10:00:34 +12:00
parent 5a60f32c55
commit 5f23d4f5ca
13 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mitmproxy/cmdline.py
View File

@ -285,7 +285,7 @@ def basic_options(parser):
parser.add_argument(
"-v", "--verbose",
action="store_const", dest="verbose", default=2, const=3,
help="Increase event log verbosity."
help="Increase log verbosity."
)
outfile = parser.add_mutually_exclusive_group()
outfile.add_argument(
@ -384,7 +384,7 @@ def proxy_options(parser):
help="""
Generic TCP SSL proxy mode for all hosts that match the pattern.
Similar to --ignore, but SSL connections are intercepted. The
communication contents are printed to the event log in verbose mode.
communication contents are printed to the log in verbose mode.
"""
)
group.add_argument(

8
mitmproxy/console/flowlist.py
View File

@ -44,11 +44,11 @@ footer = [
]
class EventListBox(urwid.ListBox):
class LogBufferBox(urwid.ListBox):
def __init__(self, master):
self.master = master
urwid.ListBox.__init__(self, master.eventlist)
urwid.ListBox.__init__(self, master.logbuffer)
def keypress(self, size, key):
key = common.shortcuts(key)
@ -56,7 +56,7 @@ class EventListBox(urwid.ListBox):
self.master.clear_events()
key = None
elif key == "G":
self.set_focus(len(self.master.eventlist) - 1)
self.set_focus(len(self.master.logbuffer) - 1)
elif key == "g":
self.set_focus(0)
return urwid.ListBox.keypress(self, size, key)
@ -76,7 +76,7 @@ class BodyPile(urwid.Pile):
[
FlowListBox(master),
urwid.Frame(
EventListBox(master),
LogBufferBox(master),
header = self.inactive_header
)
]

2
mitmproxy/console/flowview.py
View File

@ -208,7 +208,7 @@ class FlowView(tabs.Tabs):
)
except exceptions.ContentViewException:
s = "Content viewer failed: \n" + traceback.format_exc()
signals.add_event(s, "error")
signals.add_log(s, "error")
description, lines = contentviews.get_content_view(
contentviews.get("Raw"), message.content, headers=message.headers
)

39
mitmproxy/console/master.py
View File

@ -236,8 +236,7 @@ class ConsoleMaster(flow.FlowMaster):
self.palette = options.palette
self.palette_transparent = options.palette_transparent
self.eventlog = options.eventlog
self.eventlist = urwid.SimpleListWalker([])
self.logbuffer = urwid.SimpleListWalker([])
self.follow = options.follow
if options.client_replay:
@ -254,7 +253,7 @@ class ConsoleMaster(flow.FlowMaster):
signals.call_in.connect(self.sig_call_in)
signals.pop_view_state.connect(self.sig_pop_view_state)
signals.push_view_state.connect(self.sig_push_view_state)
signals.sig_add_event.connect(self.sig_add_event)
signals.sig_add_log.connect(self.sig_add_log)
self.addons.add(*builtins.default_addons())
def __setattr__(self, name, value):
@ -271,7 +270,7 @@ class ConsoleMaster(flow.FlowMaster):
# We default to using the reloader in the console ui.
return super(ConsoleMaster, self).load_script(command, use_reloader)
def sig_add_event(self, sender, e, level):
def sig_add_log(self, sender, e, level):
needed = dict(error=0, warn=1, info=2, debug=3).get(level, 2)
if self.options.verbosity < needed:
return
@ -280,13 +279,13 @@ class ConsoleMaster(flow.FlowMaster):
e = urwid.Text(("error", str(e)))
else:
e = urwid.Text(str(e))
self.eventlist.append(e)
if len(self.eventlist) > EVENTLOG_SIZE:
self.eventlist.pop(0)
self.eventlist.set_focus(len(self.eventlist) - 1)
self.logbuffer.append(e)
if len(self.logbuffer) > EVENTLOG_SIZE:
self.logbuffer.pop(0)
self.logbuffer.set_focus(len(self.logbuffer) - 1)
def add_event(self, e, level):
signals.add_event(e, level)
def add_log(self, e, level):
signals.add_log(e, level)
def sig_call_in(self, sender, seconds, callback, args=()):
def cb(*_):
@ -317,16 +316,16 @@ class ConsoleMaster(flow.FlowMaster):
status, val = s.run(method, f)
if val:
if status:
signals.add_event("Method %s return: %s" % (method, val), "debug")
signals.add_log("Method %s return: %s" % (method, val), "debug")
else:
signals.add_event(
signals.add_log(
"Method %s error: %s" %
(method, val[1]), "error")
def run_script_once(self, command, f):
if not command:
return
signals.add_event("Running script on flow: %s" % command, "debug")
signals.add_log("Running script on flow: %s" % command, "debug")
try:
s = script.Script(command)
@ -335,7 +334,7 @@ class ConsoleMaster(flow.FlowMaster):
signals.status_message.send(
message='Error loading "{}".'.format(command)
)
signals.add_event('Error loading "{}":\n{}'.format(command, e), "error")
signals.add_log('Error loading "{}":\n{}'.format(command, e), "error")
return
if f.request:
@ -348,7 +347,7 @@ class ConsoleMaster(flow.FlowMaster):
signals.flow_change.send(self, flow = f)
def toggle_eventlog(self):
self.eventlog = not self.eventlog
self.options.eventlog = not self.options.eventlog
signals.pop_view_state.send(self)
self.view_flowlist()
@ -475,7 +474,7 @@ class ConsoleMaster(flow.FlowMaster):
if self.options.rfile:
ret = self.load_flows_path(self.options.rfile)
if ret and self.state.flow_count():
signals.add_event(
signals.add_log(
"File truncated or corrupted. "
"Loaded as many flows as possible.",
"error"
@ -578,7 +577,7 @@ class ConsoleMaster(flow.FlowMaster):
if self.state.follow_focus:
self.state.set_focus(self.state.flow_count())
if self.eventlog:
if self.options.eventlog:
body = flowlist.BodyPile(self)
else:
body = flowlist.FlowListBox(self)
@ -723,7 +722,7 @@ class ConsoleMaster(flow.FlowMaster):
signals.flow_change.send(self, flow = f)
def clear_events(self):
self.eventlist[:] = []
self.logbuffer[:] = []
# Handlers
@controller.handler
@ -752,12 +751,12 @@ class ConsoleMaster(flow.FlowMaster):
super(ConsoleMaster, self).tcp_message(f)
message = f.messages[-1]
direction = "->" if message.from_client else "<-"
self.add_event("{client} {direction} tcp {direction} {server}".format(
self.add_log("{client} {direction} tcp {direction} {server}".format(
client=repr(f.client_conn.address),
server=repr(f.server_conn.address),
direction=direction,
), "info")
self.add_event(strutils.bytes_to_escaped_str(message.content), "debug")
self.add_log(strutils.bytes_to_escaped_str(message.content), "debug")
@controller.handler
def script_change(self, script):

6
mitmproxy/console/signals.py
View File

@ -3,11 +3,11 @@ from __future__ import absolute_import, print_function, division
import blinker
# Show a status message in the action bar
sig_add_event = blinker.Signal()
sig_add_log = blinker.Signal()
def add_event(e, level):
sig_add_event.send(
def add_log(e, level):
sig_add_log.send(
None,
e=e,
level=level

4
mitmproxy/controller.py
View File

@ -47,7 +47,7 @@ class Log(object):
self.master = master
def __call__(self, text, level="info"):
self.master.add_event(text, level)
self.master.add_log(text, level)
def debug(self, txt):
self(txt, "debug")
@ -89,7 +89,7 @@ class Master(object):
mitmproxy_ctx.master = None
mitmproxy_ctx.log = None
def add_event(self, e, level="info"):
def add_log(self, e, level="info"):
"""
level: debug, info, warn, error
"""

6
mitmproxy/dump.py
View File

@ -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,

6
mitmproxy/flow/master.py
View File

@ -282,7 +282,7 @@ class FlowMaster(controller.Master):
@controller.handler
def log(self, l):
self.add_event(l.msg, l.level)
self.add_log(l.msg, l.level)
@controller.handler
def clientconnect(self, root_layer):
@ -322,7 +322,7 @@ class FlowMaster(controller.Master):
**{"mitmproxy.master": self}
)
if err:
self.add_event("Error in wsgi app. %s" % err, "error")
self.add_log("Error in wsgi app. %s" % err, "error")
f.reply.kill()
return
if f not in self.state.flows: # don't add again on replay
@ -377,7 +377,7 @@ class FlowMaster(controller.Master):
@controller.handler
def tcp_error(self, flow):
self.add_event("Error in TCP connection to {}: {}".format(
self.add_log("Error in TCP connection to {}: {}".format(
repr(flow.server_conn.address),
flow.error
), "info")

10
mitmproxy/web/master.py
View File

@ -67,7 +67,7 @@ class WebState(flow.State):
self._last_event_id = 0
self.events = collections.deque(maxlen=1000)
def add_event(self, e, level):
def add_log(self, e, level):
self._last_event_id += 1
entry = {
"id": self._last_event_id,
@ -145,7 +145,7 @@ class WebMaster(flow.FlowMaster):
try:
self.load_flows_file(options.rfile)
except exceptions.FlowReadException as v:
self.add_event(
self.add_log(
"Could not read flow file: %s" % v,
"error"
)
@ -200,6 +200,6 @@ class WebMaster(flow.FlowMaster):
super(WebMaster, self).error(f)
return self._process_flow(f)
def add_event(self, e, level="info"):
super(WebMaster, self).add_event(e, level)
return self.state.add_event(e, level)
def add_log(self, e, level="info"):
super(WebMaster, self).add_log(e, level)
return self.state.add_log(e, level)

2
test/mitmproxy/mastertest.py
View File

@ -47,5 +47,5 @@ class RecordingMaster(master.FlowMaster):
master.FlowMaster.__init__(self, *args, **kwargs)
self.event_log = []
def add_event(self, e, level):
def add_log(self, e, level):
self.event_log.append((level, e))

3
test/mitmproxy/test_dump.py
View File

@ -235,7 +235,8 @@ class TestDumpMaster(mastertest.MasterTest):
ret = self.dummy_cycle(
self.mkmaster(
None,
scripts=[tutils.test_data.path("data/scripts/all.py")], verbosity=1
scripts=[tutils.test_data.path("data/scripts/all.py")],
verbosity=2
),
1, b"",
)

2
test/mitmproxy/test_examples.py
View File

@ -21,7 +21,7 @@ class ScriptError(Exception):
class RaiseMaster(master.FlowMaster):
def add_event(self, e, level):
def add_log(self, e, level):
if level in ("warn", "error"):
raise ScriptError(e)

2
test/mitmproxy/tservers.py
View File

@ -42,7 +42,7 @@ class TestMaster(flow.FlowMaster):
def clear_log(self):
self.tlog = []
def add_event(self, message, level=None):
def add_log(self, message, level=None):
self.tlog.append(message)