aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/tools')
-rw-r--r--mitmproxy/tools/dump.py8
-rw-r--r--mitmproxy/tools/web/master.py5
2 files changed, 8 insertions, 5 deletions
diff --git a/mitmproxy/tools/dump.py b/mitmproxy/tools/dump.py
index 90332627..4e2844a1 100644
--- a/mitmproxy/tools/dump.py
+++ b/mitmproxy/tools/dump.py
@@ -30,12 +30,14 @@ class Options(options.Options):
class DumpMaster(master.Master):
- def __init__(self, options, server):
+ def __init__(self, options, server, with_termlog=True, with_dumper=True):
master.Master.__init__(self, options, server)
self.has_errored = False
- self.addons.add(termlog.TermLog())
+ if with_termlog:
+ self.addons.add(termlog.TermLog())
self.addons.add(*addons.default_addons())
- self.addons.add(dumper.Dumper())
+ if with_dumper:
+ self.addons.add(dumper.Dumper())
# This line is just for type hinting
self.options = self.options # type: Options
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index 68a3db70..e6c15a0a 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -15,7 +15,7 @@ from mitmproxy.tools.web import app
class WebMaster(master.Master):
- def __init__(self, options, server):
+ def __init__(self, options, server, with_termlog=True):
super().__init__(options, server)
self.view = view.View()
self.view.sig_view_add.connect(self._sig_view_add)
@@ -34,8 +34,9 @@ class WebMaster(master.Master):
intercept.Intercept(),
self.view,
self.events,
- termlog.TermLog(),
)
+ if with_termlog:
+ self.addons.add(termlog.TermLog())
self.app = app.Application(
self, self.options.wdebug
)