Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

Improve error reporting for one-shot scripts.

Browse Source
This commit is contained in:
Aldo Cortesi 2012-10-11 11:12:06 +13:00
parent 0d59fd7e01
commit 68f1000e42
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libmproxy/console/__init__.py
View File

@ -431,20 +431,31 @@ class ConsoleMaster(flow.FlowMaster):
return str(v) return str(v)
self.stream_path = path self.stream_path = path
def _run_script_method(self, method, s, f):
status, val = s.run(method, f)
if val:
if status:
self.add_event("Method %s return: %s"%(method, val))
else:
self.add_event("Method %s error: %s"%(method, val[1]))
def run_script_once(self, path, f): def run_script_once(self, path, f):
if not path: if not path:
return return
self.add_event("Running script on flow: %s"%path)
ret = self.get_script(path) ret = self.get_script(path)
if ret[0]: if ret[0]:
self.statusbar.message(ret[0]) self.statusbar.message("Error loading script.")
self.add_event("Error loading script:\n%s"%ret[0])
return return
s = ret[1] s = ret[1]
if f.request: if f.request:
s.run("request", f) self._run_script_method("request", s, f)
if f.response: if f.response:
s.run("response", f) self._run_script_method("response", s, f)
if f.error: if f.error:
s.run("error", f) self._run_script_method("error", s, f)
s.run("done") s.run("done")
self.refresh_flow(f) self.refresh_flow(f)
self.state.last_script = path self.state.last_script = path