aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools/web/master.py
diff options
context:
space:
mode:
authorMatthew Shao <me@matshao.com>2017-03-21 19:26:04 -0500
committerMaximilian Hils <git@maximilianhils.com>2017-03-22 01:26:04 +0100
commitab2fcbef8dceb5abc97f7e73638629ded606daa6 (patch)
treeb910ea2e102a5f377ef007d70b0c8c1f962e22fb /mitmproxy/tools/web/master.py
parent00902e6febd32fe39ab0de02fd5bd8d44ccff8a0 (diff)
downloadmitmproxy-ab2fcbef8dceb5abc97f7e73638629ded606daa6.tar.gz
mitmproxy-ab2fcbef8dceb5abc97f7e73638629ded606daa6.tar.bz2
mitmproxy-ab2fcbef8dceb5abc97f7e73638629ded606daa6.zip
Fix#2184, mitmweb -n dispalys incorrect message. (#2187)
* Fixes #2184, python code. * Fixes #2184, JavaScript code. * [web] Update Footer.jsx (#2184)
Diffstat (limited to 'mitmproxy/tools/web/master.py')
-rw-r--r--mitmproxy/tools/web/master.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index e28bd002..0db5a09f 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -9,6 +9,7 @@ from mitmproxy.addons import eventstore
from mitmproxy.addons import intercept
from mitmproxy.addons import termlog
from mitmproxy.addons import view
+from mitmproxy.addons import termstatus
from mitmproxy.options import Options # noqa
from mitmproxy.tools.web import app
@@ -35,7 +36,7 @@ class WebMaster(master.Master):
self.events,
)
if with_termlog:
- self.addons.add(termlog.TermLog())
+ self.addons.add(termlog.TermLog(), termstatus.TermStatus())
self.app = app.Application(
self, self.options.web_debug
)
@@ -99,11 +100,6 @@ class WebMaster(master.Master):
iol.add_callback(self.start)
tornado.ioloop.PeriodicCallback(lambda: self.tick(timeout=0), 5).start()
- self.add_log(
- "Proxy server listening at http://{}:{}/".format(self.server.address[0], self.server.address[1]),
- "info"
- )
-
web_url = "http://{}:{}/".format(self.options.web_iface, self.options.web_port)
self.add_log(
"Web server listening at {}".format(web_url),