github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-05 02:56:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2415 from jumpserver/dev

Browse Source 
[Update] 修改导入
This commit is contained in:
老广 2019-02-20 10:41:59 +08:00 committed by GitHub
commit f269eae774
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/assets/tasks.py
View File

@ -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):
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():
""" """
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:

2
apps/ops/celery/signal_handler.py
View File

@ -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