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
55ff8254
Commit
55ff8254
authored
Dec 12, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Bugfix] 修复任务执行args为空的bug
parent
a99d5609
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
runner.py
apps/ops/ansible/runner.py
+2
-0
adhoc.py
apps/ops/models/adhoc.py
+1
-1
No files found.
apps/ops/ansible/runner.py
View file @
55ff8254
...
...
@@ -165,6 +165,8 @@ class AdHocRunner:
)
def
clean_args
(
self
,
module
,
args
):
if
not
args
:
return
''
if
module
not
in
self
.
command_modules_choices
:
return
args
if
isinstance
(
args
,
str
):
...
...
apps/ops/models/adhoc.py
View file @
55ff8254
...
...
@@ -229,7 +229,7 @@ class AdHoc(models.Model):
history
.
result
=
raw
history
.
summary
=
summary
return
raw
,
summary
except
IndexError
as
e
:
except
Exception
as
e
:
return
{},
{
"dark"
:
{
"all"
:
str
(
e
)},
"contacted"
:
[]}
finally
:
# f.close()
...
...
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