mirror of https://github.com/jumpserver/jumpserver
perf: celery task and add org single (#9698)
Co-authored-by: feng <1304903146@qq.com>pull/9701/head
parent
8db3543e98
commit
b83667bbd5
|
@ -24,7 +24,7 @@ class AccountsTaskCreateAPI(CreateAPIView):
|
|||
def perform_create(self, serializer):
|
||||
data = serializer.validated_data
|
||||
accounts = data.get('accounts', [])
|
||||
account_ids = [a.id for a in accounts]
|
||||
account_ids = [str(a.id) for a in accounts]
|
||||
|
||||
if data['action'] == 'push':
|
||||
task = push_accounts_to_assets_task.delay(account_ids)
|
||||
|
|
|
@ -43,7 +43,7 @@ class AccountSerializerCreateValidateMixin:
|
|||
def push_account(instance, push_now):
|
||||
if not push_now:
|
||||
return
|
||||
push_accounts_to_assets_task.delay([instance.id])
|
||||
push_accounts_to_assets_task.delay([str(instance.id)])
|
||||
|
||||
def create(self, validated_data):
|
||||
push_now = validated_data.pop('push_now', None)
|
||||
|
|
|
@ -204,8 +204,8 @@ class AssetTaskCreateApi(AssetsTaskMixin, generics.CreateAPIView):
|
|||
if not accounts:
|
||||
accounts = asset.accounts.all()
|
||||
|
||||
asset_ids = [asset.id]
|
||||
account_ids = accounts.values_list("id", flat=True)
|
||||
account_ids = accounts.values_list('id', flat=True)
|
||||
account_ids = [str(_id) for _id in account_ids]
|
||||
if action == "push_account":
|
||||
task = push_accounts_to_assets_task.delay(account_ids)
|
||||
elif action == "test_account":
|
||||
|
|
|
@ -33,7 +33,7 @@ def test_assets_connectivity_task(asset_ids, org_id, task_name=None):
|
|||
|
||||
def test_assets_connectivity_manual(assets):
|
||||
task_name = gettext_noop("Test assets connectivity ")
|
||||
asset_ids = [i.id for i in assets]
|
||||
asset_ids = [str(i.id) for i in assets]
|
||||
org_id = str(current_org.id)
|
||||
return test_assets_connectivity_task.delay(asset_ids, org_id, task_name)
|
||||
|
||||
|
@ -41,5 +41,6 @@ def test_assets_connectivity_manual(assets):
|
|||
def test_node_assets_connectivity_manual(node):
|
||||
task_name = gettext_noop("Test if the assets under the node are connectable ")
|
||||
asset_ids = node.get_all_asset_ids()
|
||||
asset_ids = [str(i) for i in asset_ids]
|
||||
org_id = str(current_org.id)
|
||||
return test_assets_connectivity_task.delay(asset_ids, org_id, task_name)
|
||||
|
|
|
@ -59,7 +59,7 @@ def expire_user_orgs(*args):
|
|||
|
||||
@receiver(post_save, sender=Organization)
|
||||
def on_org_create(sender, instance, created=False, **kwargs):
|
||||
if created:
|
||||
if not created:
|
||||
return
|
||||
expire_user_orgs()
|
||||
|
||||
|
|
Loading…
Reference in New Issue