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

Updated write_error

pull/38/head
Sheng 2018-10-13 08:52:32 +08:00
parent daa2402167
commit 9aebb6e4e3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webssh/handler.py
View File

@ -77,15 +77,15 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
def write_error(self, status_code, **kwargs): def write_error(self, status_code, **kwargs):
if not swallow_http_errors: if not swallow_http_errors:
super(MixinHandler, self).write_error(status_code, **kwargs) super(MixinHandler, self).write_error(status_code, **kwargs)
else:
if status_code == 500:
self._reason = 'Internal Server Error'
else: else:
exc_info = kwargs.get('exc_info') exc_info = kwargs.get('exc_info')
if exc_info: if exc_info:
self._reason = exc_info[1].log_message reason = getattr(exc_info[1], 'log_message', None)
if reason:
self._reason = reason
self.result.update(status=self._reason) self.result.update(status=self._reason)
self.set_status(200) self.set_status(200)
self.set_header('Server', 'TornadoServer')
self.finish(self.result) self.finish(self.result)
def get_ssh_client(self): def get_ssh_client(self):

2
webssh/static/js/main.js
View File

@ -189,7 +189,7 @@ jQuery(function($){
} }
var msg = resp.responseJSON; var msg = resp.responseJSON;
if (msg.status) { if (!msg.id) {
log_status(msg.status); log_status(msg.status);
state = DISCONNECTED; state = DISCONNECTED;
return; return;