Unverified Commit f269eae7 authored by 老广's avatar 老广 Committed by GitHub

Merge pull request #2415 from jumpserver/dev

[Update] 修改导入
parents b7b62183 6f19fcb7
...@@ -23,7 +23,7 @@ TIMEOUT = 60 ...@@ -23,7 +23,7 @@ TIMEOUT = 60
logger = get_logger(__file__) logger = get_logger(__file__)
CACHE_MAX_TIME = 60*60*2 CACHE_MAX_TIME = 60*60*2
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", "off") PERIOD_TASK = os.environ.get("PERIOD_TASK", "on")
def clean_hosts(assets): def clean_hosts(assets):
...@@ -125,8 +125,6 @@ def update_assets_hardware_info_util(assets, task_name=None): ...@@ -125,8 +125,6 @@ def update_assets_hardware_info_util(assets, task_name=None):
pattern='all', options=const.TASK_OPTIONS, run_as_admin=True, pattern='all', options=const.TASK_OPTIONS, run_as_admin=True,
) )
result = task.run() result = task.run()
# Todo: may be somewhere using
# Manual run callback function
set_assets_hardware_info(assets, result) set_assets_hardware_info(assets, result)
return result return result
...@@ -213,6 +211,9 @@ def test_admin_user_connectivity_period(): ...@@ -213,6 +211,9 @@ def test_admin_user_connectivity_period():
""" """
A period task that update the ansible task 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' key = '_JMS_TEST_ADMIN_USER_CONNECTIVITY_PERIOD'
prev_execute_time = cache.get(key) prev_execute_time = cache.get(key)
if prev_execute_time: if prev_execute_time:
......
...@@ -5,7 +5,7 @@ import logging ...@@ -5,7 +5,7 @@ import logging
from django.core.cache import cache from django.core.cache import cache
from celery import subtask from celery import subtask
from celery.signals import ( from celery.signals import (
worker_ready, worker_shutdown, after_setup_logger, setup_logging worker_ready, worker_shutdown, after_setup_logger
) )
from kombu.utils.encoding import safe_str from kombu.utils.encoding import safe_str
from django_celery_beat.models import PeriodicTask from django_celery_beat.models import PeriodicTask
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment