aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/flow/master.py
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/flow/master.py')
-rw-r--r--mitmproxy/flow/master.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/mitmproxy/flow/master.py b/mitmproxy/flow/master.py
index 81882fcd..94b46f3f 100644
--- a/mitmproxy/flow/master.py
+++ b/mitmproxy/flow/master.py
@@ -57,11 +57,7 @@ class FlowMaster(controller.Master):
self.apps = modules.AppRegistry()
def start_app(self, host, port):
- self.apps.add(
- app.mapp,
- host,
- port
- )
+ self.apps.add(app.mapp, host, port)
def set_stream_large_bodies(self, max_size):
if max_size is not None:
@@ -69,9 +65,6 @@ class FlowMaster(controller.Master):
else:
self.stream_large_bodies = False
- def tick(self, timeout):
- return super(FlowMaster, self).tick(timeout)
-
def duplicate_flow(self, f):
"""
Duplicate flow, and insert it into state without triggering any of
@@ -267,10 +260,7 @@ class FlowMaster(controller.Master):
@controller.handler
def tcp_error(self, flow):
- self.add_log("Error in TCP connection to {}: {}".format(
- repr(flow.server_conn.address),
- flow.error
- ), "info")
+ pass
@controller.handler
def tcp_close(self, flow):