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

Merge remote-tracking branch 'origin/1.5.5' into 1.5.5

Browse Source
This commit is contained in:
ibuler 2019-11-14 14:54:20 +08:00
commit 31f5b2c06c
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/settings/api.py
View File

@ -186,6 +186,8 @@ class LDAPUserListApi(generics.ListAPIView):
sync_util = LDAPSyncUtil()
# 还没有同步任务
if sync_util.task_no_start:
# 任务外部设置 task running 状态
sync_util.set_task_status(sync_util.TASK_STATUS_IS_RUNNING)
task = sync_ldap_user_task.delay()
data = {'msg': 'Cache no data, sync task {} started.'.format(task.id)}
return Response(data=data, status=409)