kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-26 13:24:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1641 from cortesi/v0.18.x

Browse Source 
console: correct handling of logs
This commit is contained in:
Aldo Cortesi
2016-10-21 10:45:38 +13:00
committed by GitHub
parent 5db860a334 ffe7eb94f1
commit 6b524c9054
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mitmproxy/console/master.py
View File

@@ -285,9 +285,6 @@ class ConsoleMaster(flow.FlowMaster):
self.logbuffer.pop(0)
self.logbuffer.set_focus(len(self.logbuffer) - 1)
def add_log(self, e, level):
signals.add_log(e, level)
def sig_call_in(self, sender, seconds, callback, args=()):
def cb(*_):
return callback(*args)
@@ -703,9 +700,13 @@ class ConsoleMaster(flow.FlowMaster):
super(ConsoleMaster, self).tcp_message(f)
message = f.messages[-1]
direction = "->" if message.from_client else "<-"
self.add_log("{client} {direction} tcp {direction} {server}".format(
signals.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_log(strutils.bytes_to_escaped_str(message.content), "debug")
signals.add_log(strutils.bytes_to_escaped_str(message.content), "debug")
@controller.handler
def log(self, evt):
signals.add_log(evt.msg, evt.level)