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
6f19fcb7
Commit
6f19fcb7
authored
Feb 20, 2019
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修改tasks
parent
5cd809b4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
tasks.py
apps/assets/tasks.py
+4
-3
No files found.
apps/assets/tasks.py
View file @
6f19fcb7
...
...
@@ -23,7 +23,7 @@ TIMEOUT = 60
logger
=
get_logger
(
__file__
)
CACHE_MAX_TIME
=
60
*
60
*
2
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
"
)
def
clean_hosts
(
assets
):
...
...
@@ -125,8 +125,6 @@ def update_assets_hardware_info_util(assets, task_name=None):
pattern
=
'all'
,
options
=
const
.
TASK_OPTIONS
,
run_as_admin
=
True
,
)
result
=
task
.
run
()
# Todo: may be somewhere using
# Manual run callback function
set_assets_hardware_info
(
assets
,
result
)
return
result
...
...
@@ -213,6 +211,9 @@ def test_admin_user_connectivity_period():
"""
A period task that update the ansible task period
"""
if
PERIOD_TASK
!=
"on"
:
logger
.
debug
(
'Period task off, skip'
)
return
key
=
'_JMS_TEST_ADMIN_USER_CONNECTIVITY_PERIOD'
prev_execute_time
=
cache
.
get
(
key
)
if
prev_execute_time
:
...
...
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