From 532ae7dc4acfd6082eca92d0daf7608f94c46232 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Sat, 16 Jul 2016 09:22:56 +1200 Subject: 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. --- mitmproxy/console/master.py | 6 +++--- 1 file 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 -- cgit v1.2.3