aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-07-16 09:22:56 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-07-16 09:22:56 +1200
commit532ae7dc4acfd6082eca92d0daf7608f94c46232 (patch)
tree5f35d18771e10e6a11a74d87853b29e5194c53ed
parentc4fb489a96c58932609cced96d5b0d3c2687f15f (diff)
downloadmitmproxy-532ae7dc4acfd6082eca92d0daf7608f94c46232.tar.gz
mitmproxy-532ae7dc4acfd6082eca92d0daf7608f94c46232.tar.bz2
mitmproxy-532ae7dc4acfd6082eca92d0daf7608f94c46232.zip
Add addons after initialisation in mitmproxy console
The main effect of this is that we now properly capture errors on startup that were ignored before.
-rw-r--r--mitmproxy/console/master.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/console/master.py b/mitmproxy/console/master.py
index 64bd9f0a..1ca15abe 100644
--- a/mitmproxy/console/master.py
+++ b/mitmproxy/console/master.py
@@ -204,8 +204,6 @@ class ConsoleMaster(flow.FlowMaster):
def __init__(self, server, options):
flow.FlowMaster.__init__(self, options, server, ConsoleState())
- self.addons.add(*builtins.default_addons())
-
self.stream_path = None
# This line is just for type hinting
self.options = self.options # type: Options
@@ -252,10 +250,12 @@ class ConsoleMaster(flow.FlowMaster):
if options.app:
self.start_app(self.options.app_host, self.options.app_port)
+
signals.call_in.connect(self.sig_call_in)
signals.pop_view_state.connect(self.sig_pop_view_state)
signals.push_view_state.connect(self.sig_push_view_state)
signals.sig_add_event.connect(self.sig_add_event)
+ self.addons.add(*builtins.default_addons())
def __setattr__(self, name, value):
self.__dict__[name] = value
@@ -272,7 +272,7 @@ class ConsoleMaster(flow.FlowMaster):
return super(ConsoleMaster, self).load_script(command, use_reloader)
def sig_add_event(self, sender, e, level):
- needed = dict(error=0, info=1, debug=2).get(level, 1)
+ needed = dict(error=0, warn=1, info=2, debug=3).get(level, 2)
if self.options.verbosity < needed:
return