Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include a formatted exception in WSGI error page.

This commit is contained in:
Aldo Cortesi 2012-05-07 21:34:01 +12:00
parent 116fcfcf7a
commit d42fdc4ff6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmproxy/dump.py
View File

@ -214,12 +214,12 @@ class DumpMaster(flow.FlowMaster):
self._process_flow(f)
return f
# begin nocover
def shutdown(self):
if self.o.wfile:
self.wfile.fo.close()
return flow.FlowMaster.shutdown(self)
# begin nocover
def run(self):
if self.o.rfile and not self.o.keepserving:
if self.script:

12
libmproxy/wsgi.py
View File

@ -1,4 +1,4 @@
import cStringIO, urllib, time, sys
import cStringIO, urllib, time, sys, traceback
import version, flow
def date_time_string():
@ -55,7 +55,7 @@ class WSGIAdaptor:
environ[key] = value
return environ
def error_page(self, soc, headers_sent):
def error_page(self, soc, headers_sent, s):
"""
Make a best-effort attempt to write an error page. If headers are
already sent, we just bung the error into the page.
@ -63,10 +63,11 @@ class WSGIAdaptor:
c = """
<html>
<h1>Internal Server Error</h1>
<pre>%s"</pre>
</html>
"""
"""%s
if not headers_sent:
soc.write("HTTP/1.1 500 Internal Server Error%s\r\n")
soc.write("HTTP/1.1 500 Internal Server Error\r\n")
soc.write("Content-Type: text/html\r\n")
soc.write("Content-Length: %s\r\n"%len(c))
soc.write("\r\n")
@ -115,7 +116,8 @@ class WSGIAdaptor:
write("")
except Exception, v:
try:
self.error_page(soc, state["headers_sent"])
s = traceback.format_exc()
self.error_page(soc, state["headers_sent"], s)
# begin nocover
except Exception, v:
pass