perf: 统一后台定时任务的crontab表达式, 对于后台定时执行的任务更加清晰

pull/8970/head
Jiangjie.Bai 2022-10-10 16:31:45 +08:00
parent cd98ec4cac
commit 145814f1e8
4 changed files with 13 additions and 4 deletions

View File

@ -8,6 +8,8 @@ from assets.utils import check_node_assets_amount
from common.utils.lock import AcquireFailed from common.utils.lock import AcquireFailed
from common.utils import get_logger from common.utils import get_logger
from common.const.crontab import CRONTAB_AT_AM_TWO
logger = get_logger(__file__) logger = get_logger(__file__)
@ -29,7 +31,7 @@ def check_node_assets_amount_task(org_id=None):
logger.error(error) logger.error(error)
@register_as_period_task(crontab='0 2 * * *') @register_as_period_task(crontab=CRONTAB_AT_AM_TWO)
@shared_task @shared_task
def check_node_assets_amount_period_task(): def check_node_assets_amount_period_task():
check_node_assets_amount_task() check_node_assets_amount_task()

View File

@ -0,0 +1,5 @@
CRONTAB_AT_AM_TWO = '0 14 * * *'
CRONTAB_AT_AM_TEN = '0 10 * * *'
CRONTAB_AT_PM_TWO = '0 2 * * *'

View File

@ -10,6 +10,7 @@ from celery import shared_task
from orgs.utils import tmp_to_root_org from orgs.utils import tmp_to_root_org
from common.utils import get_logger from common.utils import get_logger
from common.utils.timezone import local_now, dt_formatter, dt_parser from common.utils.timezone import local_now, dt_formatter, dt_parser
from common.const.crontab import CRONTAB_AT_AM_TEN
from ops.celery.decorator import register_as_period_task from ops.celery.decorator import register_as_period_task
from perms.notifications import ( from perms.notifications import (
PermedAssetsWillExpireUserMsg, AssetPermsWillExpireForOrgAdminMsg, PermedAssetsWillExpireUserMsg, AssetPermsWillExpireForOrgAdminMsg,
@ -54,7 +55,7 @@ def check_asset_permission_expired():
UserGrantedTreeRefreshController.add_need_refresh_by_asset_perm_ids_cross_orgs(asset_perm_ids) UserGrantedTreeRefreshController.add_need_refresh_by_asset_perm_ids_cross_orgs(asset_perm_ids)
@register_as_period_task(crontab='0 10 * * *') @register_as_period_task(crontab=CRONTAB_AT_AM_TEN)
@shared_task() @shared_task()
@atomic() @atomic()
@tmp_to_root_org() @tmp_to_root_org()

View File

@ -15,6 +15,7 @@ from orgs.models import Organization
from .models import User from .models import User
from users.notifications import UserExpirationReminderMsg from users.notifications import UserExpirationReminderMsg
from settings.utils import LDAPServerUtil, LDAPImportUtil from settings.utils import LDAPServerUtil, LDAPImportUtil
from common.const.crontab import CRONTAB_AT_AM_TEN, CRONTAB_AT_PM_TWO
logger = get_logger(__file__) logger = get_logger(__file__)
@ -41,7 +42,7 @@ def check_password_expired_periodic():
'check_password_expired_periodic': { 'check_password_expired_periodic': {
'task': check_password_expired.name, 'task': check_password_expired.name,
'interval': None, 'interval': None,
'crontab': '0 10 * * *', 'crontab': CRONTAB_AT_AM_TEN,
'enabled': True, 'enabled': True,
} }
} }
@ -72,7 +73,7 @@ def check_user_expired_periodic():
'check_user_expired_periodic': { 'check_user_expired_periodic': {
'task': check_user_expired.name, 'task': check_user_expired.name,
'interval': None, 'interval': None,
'crontab': '0 14 * * *', 'crontab': CRONTAB_AT_PM_TWO,
'enabled': True, 'enabled': True,
} }
} }