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
8b63961d
Commit
8b63961d
authored
Mar 14, 2018
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 默认开启定时检测,运行失败默认log为warn
parent
2e8f5919
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
tasks.py
apps/assets/tasks.py
+1
-1
models.py
apps/ops/models.py
+1
-1
No files found.
apps/assets/tasks.py
View file @
8b63961d
...
@@ -21,7 +21,7 @@ TIMEOUT = 60
...
@@ -21,7 +21,7 @@ TIMEOUT = 60
logger
=
get_logger
(
__file__
)
logger
=
get_logger
(
__file__
)
CACHE_MAX_TIME
=
60
*
60
*
60
CACHE_MAX_TIME
=
60
*
60
*
60
disk_pattern
=
re
.
compile
(
r'^hd|sd|xvd|vd'
)
disk_pattern
=
re
.
compile
(
r'^hd|sd|xvd|vd'
)
PERIOD_TASK
=
os
.
environ
.
get
(
"PERIOD_TASK"
,
"o
ff
"
)
PERIOD_TASK
=
os
.
environ
.
get
(
"PERIOD_TASK"
,
"o
n
"
)
@shared_task
@shared_task
...
...
apps/ops/models.py
View file @
8b63961d
...
@@ -234,7 +234,7 @@ class AdHoc(models.Model):
...
@@ -234,7 +234,7 @@ class AdHoc(models.Model):
result
=
runner
.
run
(
self
.
tasks
,
self
.
pattern
,
self
.
task
.
name
)
result
=
runner
.
run
(
self
.
tasks
,
self
.
pattern
,
self
.
task
.
name
)
return
result
.
results_raw
,
result
.
results_summary
return
result
.
results_raw
,
result
.
results_summary
except
AnsibleError
as
e
:
except
AnsibleError
as
e
:
logger
.
error
(
"Failed run adhoc {}, {}"
.
format
(
self
.
task
.
name
,
e
))
logger
.
warn
(
"Failed run adhoc {}, {}"
.
format
(
self
.
task
.
name
,
e
))
pass
pass
@become.setter
@become.setter
...
...
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