diff --git a/apps/ops/tasks.py b/apps/ops/tasks.py index 3da3b726e..6292df69d 100644 --- a/apps/ops/tasks.py +++ b/apps/ops/tasks.py @@ -144,10 +144,10 @@ def clean_job_execution_period(): del_res = JobExecution.objects.filter(date_created__lt=expired_day).delete() logger.info(f"clean job_execution db record success! delete {days} days {del_res[0]} records") - -@shared_task -def longtime_add(x, y): - print('long time task begins') - time.sleep(50) - print('long time task finished') - return x + y +# 测试使用,注释隐藏 +# @shared_task +# def longtime_add(x, y): +# print('long time task begins') +# time.sleep(50) +# print('long time task finished') +# return x + y diff --git a/apps/settings/tasks/ldap.py b/apps/settings/tasks/ldap.py index 856389512..e600017cb 100644 --- a/apps/settings/tasks/ldap.py +++ b/apps/settings/tasks/ldap.py @@ -9,7 +9,7 @@ from common.utils import get_logger from common.utils.timezone import local_now_display from ops.celery.decorator import after_app_ready_start from ops.celery.utils import ( - create_or_update_celery_periodic_tasks, disable_celery_periodic_task + create_or_update_celery_periodic_tasks, delete_celery_periodic_task ) from orgs.models import Organization from settings.notifications import LDAPImportMessage @@ -69,6 +69,7 @@ def import_ldap_user_periodic(): if not settings.AUTH_LDAP: return task_name = 'import_ldap_user_periodic' + delete_celery_periodic_task(task_name) if not settings.AUTH_LDAP_SYNC_IS_PERIODIC: return @@ -85,8 +86,7 @@ def import_ldap_user_periodic(): task_name: { 'task': import_ldap_user.name, 'interval': interval, - 'crontab': crontab, - 'enabled': True, + 'crontab': crontab } } create_or_update_celery_periodic_tasks(tasks)