aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/flow.py
diff options
context:
space:
mode:
authorMatthewShao <me@matshao.com>2016-01-12 11:45:03 +0800
committerMatthewShao <me@matshao.com>2016-01-12 11:45:03 +0800
commite72663be081b8ef534b4ef43b90807c55d15b8fb (patch)
treec1284d3ac2b33af9f9d99b9d71bdf7d475f23bb0 /libmproxy/flow.py
parentaea3837d4ae637af42f716acb27d7ea8394ece35 (diff)
downloadmitmproxy-e72663be081b8ef534b4ef43b90807c55d15b8fb.tar.gz
mitmproxy-e72663be081b8ef534b4ef43b90807c55d15b8fb.tar.bz2
mitmproxy-e72663be081b8ef534b4ef43b90807c55d15b8fb.zip
Fix script reloader on OS X.
Diffstat (limited to 'libmproxy/flow.py')
-rw-r--r--libmproxy/flow.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py
index f02b5767..5e4ca5f6 100644
--- a/libmproxy/flow.py
+++ b/libmproxy/flow.py
@@ -666,7 +666,7 @@ class FlowMaster(controller.Master):
script.reloader.unwatch(script_obj)
self.scripts.remove(script_obj)
- def load_script(self, command, use_reloader=False):
+ def load_script(self, command, use_reloader=True):
"""
Loads a script. Returns an error description if something went
wrong.
@@ -1040,14 +1040,14 @@ class FlowMaster(controller.Master):
s.unload()
except script.ScriptException as e:
ok = False
- self.add_event('Error reloading "{}": {}'.format(s.filename, str(e)))
+ self.add_event('Error reloading "{}": {}'.format(s.filename, str(e)), 'error')
try:
s.load()
except script.ScriptException as e:
ok = False
- self.add_event('Error reloading "{}": {}'.format(s.filename, str(e)))
+ self.add_event('Error reloading "{}": {}'.format(s.filename, str(e)), 'error')
else:
- self.add_event('"{}" reloaded.'.format(s.filename))
+ self.add_event('"{}" reloaded.'.format(s.filename), 'info')
return ok
def shutdown(self):