jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Swallow 500 errors

pull/26/head
Sheng 2018-08-28 21:15:57 +08:00
parent ad12876b0c
commit 49226fbf23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webssh/handler.py
View File

@ -74,13 +74,15 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
self.result = dict(id=None, status=None, encoding=None) self.result = dict(id=None, status=None, encoding=None)
def write_error(self, status_code, **kwargs): def write_error(self, status_code, **kwargs):
if self.settings.get('serve_traceback') or status_code == 500 or \ if not swallow_http_errors:
not swallow_http_errors:
super(MixinHandler, self).write_error(status_code, **kwargs) super(MixinHandler, self).write_error(status_code, **kwargs)
else: else:
exc_info = kwargs.get('exc_info') if status_code == 500:
if exc_info: self._reason = 'Internal Server Error'
self._reason = exc_info[1].log_message else:
exc_info = kwargs.get('exc_info')
if exc_info:
self._reason = exc_info[1].log_message
self.result.update(status=self._reason) self.result.update(status=self._reason)
self.set_status(200) self.set_status(200)
self.finish(self.result) self.finish(self.result)