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

5 years ago · 31f5b2c06c
parent 611d5fc1fa aebf32d7be
commit 31f5b2c06c
1 changed files with 2 additions and 0 deletions
--- a/apps/settings/api.py
+++ b/apps/settings/api.py
@ -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)