diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-12-24 11:20:12 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-24 11:20:12 +1300 |
| commit | 5167d59d63e8f70770119a26804feaad17fccb8f (patch) | |
| tree | 8d31230fb601d7da87ee5d9da46a0a554c12b0ed /mitmproxy/tools/web/master.py | |
| parent | 9f1cbe8746df6096e877b2cc57d386ff08f079d8 (diff) | |
| parent | 24751965f99daf83c82d9c1581f712ca24da9d3d (diff) | |
| download | mitmproxy-5167d59d63e8f70770119a26804feaad17fccb8f.tar.gz mitmproxy-5167d59d63e8f70770119a26804feaad17fccb8f.tar.bz2 mitmproxy-5167d59d63e8f70770119a26804feaad17fccb8f.zip | |
Merge branch 'master' into admin
Diffstat (limited to 'mitmproxy/tools/web/master.py')
| -rw-r--r-- | mitmproxy/tools/web/master.py | 5 |
1 files changed, 3 insertions, 2 deletions
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 ) |