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

Enhanced

pull/12/head
Sheng 2018-04-02 21:50:05 +08:00
parent 715d50907a
commit 20ba6bad36
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main.py
View File

@ -229,8 +229,8 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
try: try:
worker = self.ssh_connect() worker = self.ssh_connect()
except Exception as exc: except Exception as exc:
logging.error(traceback.format_exc())
future.set_exception(exc) future.set_exception(exc)
raise exc
else: else:
future.set_result(worker) future.set_result(worker)
@ -243,16 +243,15 @@ class IndexHandler(MixinHandler, tornado.web.RequestHandler):
status = None status = None
future = Future() future = Future()
try:
threading.Thread( threading.Thread(
target=self.ssh_connect_wrapped, args=(future,) target=self.ssh_connect_wrapped, args=(future,)
).start() ).start()
yield future
try:
worker = yield future
except Exception as exc: except Exception as exc:
logging.error(traceback.format_exc())
status = str(exc) status = str(exc)
else: else:
worker = future.result()
worker.src_addr = self.get_client_addr() worker.src_addr = self.get_client_addr()
worker_id = worker.id worker_id = worker.id
workers[worker_id] = worker workers[worker_id] = worker