aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/tools/web/master.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2017-01-29 12:28:52 +1300
committerAldo Cortesi <aldo@nullcube.com>2017-01-30 11:15:12 +1300
commit35aff3b7838f8df718cc574d2643f1355849fa8e (patch)
tree0b21adf7b658abdb45eca2fa79264622f5aac952 /mitmproxy/tools/web/master.py
parent356c4987a2a43816c59f5cd070097d2e777b2272 (diff)
downloadmitmproxy-35aff3b7838f8df718cc574d2643f1355849fa8e.tar.gz
mitmproxy-35aff3b7838f8df718cc574d2643f1355849fa8e.tar.bz2
mitmproxy-35aff3b7838f8df718cc574d2643f1355849fa8e.zip
Consolidate option names
- Onboarding app options to onboarding* - Console-specific options to console_* - Web-specific options to web_*
Diffstat (limited to 'mitmproxy/tools/web/master.py')
-rw-r--r--mitmproxy/tools/web/master.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py
index e6c15a0a..6ebcfe47 100644
--- a/mitmproxy/tools/web/master.py
+++ b/mitmproxy/tools/web/master.py
@@ -38,7 +38,7 @@ class WebMaster(master.Master):
if with_termlog:
self.addons.add(termlog.TermLog())
self.app = app.Application(
- self, self.options.wdebug
+ self, self.options.web_debug
)
# This line is just for type hinting
self.options = self.options # type: Options
@@ -103,7 +103,7 @@ class WebMaster(master.Master):
iol = tornado.ioloop.IOLoop.instance()
http_server = tornado.httpserver.HTTPServer(self.app)
- http_server.listen(self.options.wport, self.options.wiface)
+ http_server.listen(self.options.web_port, self.options.web_iface)
iol.add_callback(self.start)
tornado.ioloop.PeriodicCallback(lambda: self.tick(timeout=0), 5).start()
@@ -113,13 +113,13 @@ class WebMaster(master.Master):
"info"
)
- web_url = "http://{}:{}/".format(self.options.wiface, self.options.wport)
+ web_url = "http://{}:{}/".format(self.options.web_iface, self.options.web_port)
self.add_log(
"Web server listening at {}".format(web_url),
"info"
)
- if self.options.open_browser:
+ if self.options.web_open_browser:
success = open_browser(web_url)
if not success:
self.add_log(