github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-11-13 23:22:40 +00:00
Code Issues Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
ibuler
2015-11-25 18:59:12 +08:00
parent 0335bc26ca
commit 2c0d42e0da
5 changed files with 32 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
run_websocket.py
View File

@@ -275,8 +275,11 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
for t in WebTerminalHandler.tasks:
if t.is_alive():
continue
t.setDaemon(True)
t.start()
try:
t.setDaemon(True)
t.start()
except RuntimeError:
pass
def on_message(self, message):
data = json.loads(message)
@@ -309,6 +312,8 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
self.log.is_finished = True
self.log.end_time = datetime.datetime.now()
self.log.save()
self.log_time_f.write('0')
self.log_time_f.close()
self.close()
except AttributeError:
pass
@@ -331,7 +336,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
try:
self.write_message(json.dumps({'data': data}))
now_timestamp = time.time()
self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))
self.log_time_f.write('%s\n%s ' % (len(data), round(now_timestamp-pre_timestamp, 4)))
self.log_file_f.write(data)
pre_timestamp = now_timestamp
self.log_file_f.flush()