diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-01-18 12:21:21 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-01-18 12:21:21 +0100 |
| commit | 7eb9bf818c6ab0b4fa341d741ead0a4199805473 (patch) | |
| tree | a5b148925f1ffefcbe726c075890037a952d86bc /libmproxy/flow.py | |
| parent | 0f54f2990c0a32960ec5c82c620f79c68ad5f4b6 (diff) | |
| parent | 8aeed2032d369fa7e818d3a4cb46d440ec3569a4 (diff) | |
| download | mitmproxy-7eb9bf818c6ab0b4fa341d741ead0a4199805473.tar.gz mitmproxy-7eb9bf818c6ab0b4fa341d741ead0a4199805473.tar.bz2 mitmproxy-7eb9bf818c6ab0b4fa341d741ead0a4199805473.zip | |
Merge pull request #881 from MatthewShao/Fix#846
Fix #846
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): |