diff options
| author | Sandor Nemes <snemes@users.noreply.github.com> | 2016-01-18 13:35:27 +0100 |
|---|---|---|
| committer | Sandor Nemes <snemes@users.noreply.github.com> | 2016-01-18 13:35:27 +0100 |
| commit | b892957b9021315b5d03074dd07b97cf4f81258b (patch) | |
| tree | 4a55c7ce906b57b2f34d74cb6ff2159eeb550977 /libmproxy/flow.py | |
| parent | 918a457f5a6e4b3281f86ba31107d0a05082fb5e (diff) | |
| parent | 7eb9bf818c6ab0b4fa341d741ead0a4199805473 (diff) | |
| download | mitmproxy-b892957b9021315b5d03074dd07b97cf4f81258b.tar.gz mitmproxy-b892957b9021315b5d03074dd07b97cf4f81258b.tar.bz2 mitmproxy-b892957b9021315b5d03074dd07b97cf4f81258b.zip | |
Merge branch 'master' into master
Diffstat (limited to 'libmproxy/flow.py')
| -rw-r--r-- | libmproxy/flow.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/flow.py b/libmproxy/flow.py index 8e066191..1f28166f 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 handle_tcp_message(self, m): |