github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3375 from jumpserver/dev 

[Update] Add debug message
pull/3463/head
BaiJiangJie 2019-10-23 15:18:35 +08:00 committed by GitHub
parent 93e8c9e534 f802fb645d
commit 5e5f3ad383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/ops/ws.py
View File

@ -41,6 +41,7 @@ class CeleryLogWebsocket(JsonWebsocketConsumer):
def read_log_file(self, task_id): def read_log_file(self, task_id):
task_log_f = self.wait_util_log_path_exist(task_id) task_log_f = self.wait_util_log_path_exist(task_id)
if not task_log_f: if not task_log_f:
logger.debug('Task log file is None: {}'.format(task_id))
return return
task_end_mark = [] task_end_mark = []
@ -49,7 +50,8 @@ class CeleryLogWebsocket(JsonWebsocketConsumer):
if data: if data:
data = data.replace(b'\n', b'\r\n') data = data.replace(b'\n', b'\r\n')
self.send_json( self.send_json(
{'message': data.decode(errors='ignore'), 'task': task_id}) {'message': data.decode(errors='ignore'), 'task': task_id}
)
if data.find(b'succeeded in') != -1: if data.find(b'succeeded in') != -1:
task_end_mark.append(1) task_end_mark.append(1)
if data.find(bytes(task_id, 'utf8')) != -1: if data.find(bytes(task_id, 'utf8')) != -1: