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

fix: ldap ha periodic task did not execute as expected

Browse Source
This commit is contained in:
wangruidong
2025-01-08 16:33:19 +08:00
committed by Bryan
parent 7791d6222a
commit c0b301d52b
4 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/settings/tasks/ldap.py
View File

@@ -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
create_or_update_celery_periodic_tasks, disable_celery_periodic_task
)
from orgs.models import Organization
from settings.notifications import LDAPImportMessage
@@ -90,9 +90,12 @@ def import_ldap_ha_user():
def register_periodic_task(task_name, task_func, interval_key, enabled_key, crontab_key, **kwargs):
interval = kwargs.get(interval_key, settings.AUTH_LDAP_SYNC_INTERVAL)
enabled = kwargs.get(enabled_key, settings.AUTH_LDAP_SYNC_IS_PERIODIC)
crontab = kwargs.get(crontab_key, settings.AUTH_LDAP_SYNC_CRONTAB)
interval = kwargs.get(interval_key, getattr(settings, interval_key))
enabled = kwargs.get(enabled_key, getattr(settings, enabled_key))
crontab = kwargs.get(crontab_key, getattr(settings, crontab_key))
if not enabled:
disable_celery_periodic_task(task_name)
if isinstance(interval, int):
interval = interval * 3600