Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
5e5f3ad3
Unverified
Commit
5e5f3ad3
authored
Oct 23, 2019
by
BaiJiangJie
Committed by
GitHub
Oct 23, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3375 from jumpserver/dev
[Update] Add debug message
parents
93e8c9e5
f802fb64
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
ws.py
apps/ops/ws.py
+3
-1
No files found.
apps/ops/ws.py
View file @
5e5f3ad3
...
...
@@ -41,6 +41,7 @@ class CeleryLogWebsocket(JsonWebsocketConsumer):
def
read_log_file
(
self
,
task_id
):
task_log_f
=
self
.
wait_util_log_path_exist
(
task_id
)
if
not
task_log_f
:
logger
.
debug
(
'Task log file is None: {}'
.
format
(
task_id
))
return
task_end_mark
=
[]
...
...
@@ -49,7 +50,8 @@ class CeleryLogWebsocket(JsonWebsocketConsumer):
if
data
:
data
=
data
.
replace
(
b
'
\n
'
,
b
'
\r\n
'
)
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
:
task_end_mark
.
append
(
1
)
if
data
.
find
(
bytes
(
task_id
,
'utf8'
))
!=
-
1
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment