From f7e4e89b124e0bc20cf8192227add04bd92846ae Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Wed, 3 Aug 2011 13:33:18 +1200 Subject: Move the event notification mechanism into flow.py --- libmproxy/dump.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'libmproxy/dump.py') diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 4d437b38..a47066d9 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -20,6 +20,7 @@ class Options(object): "rfile", "rheaders", "server_replay", + "script", "stickycookie", "stickyauth", "verbosity", @@ -132,23 +133,13 @@ class DumpMaster(flow.FlowMaster): "%s: %s\n%s"%(script, e.args[0], eout) ) - def handle_clientconnect(self, c): + def add_event(self, e, level="info"): if self.eventlog: - print >> self.outfile, "Connection from: %s:%s"%c.address - return flow.FlowMaster.handle_clientconnect(self, c) - - def handle_clientdisconnect(self, c): - if self.eventlog: - print >> self.outfile, "Disconnect from: %s:%s"%tuple(c.client_conn.address), - print >> self.outfile, "(handled %s requests)"%c.client_conn.requestcount - if c.client_conn.connection_error: - print >> self.outfile, "\terror: %s"%c.client_conn.connection_error - return flow.FlowMaster.handle_clientconnect(self, c) + print >> self.outfile, e def handle_request(self, r): f = flow.FlowMaster.handle_request(self, r) - if self.eventlog: - print >> self.outfile, "Request: %s"%str_request(r) + self.add_event("Request: %s"%str_request(r)) if f: r.ack() return f -- cgit v1.2.3