From 88d4bf932c3c8b17a49cecffad02fcf2beff115a Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 5 Aug 2022 16:17:45 +0800 Subject: [PATCH] perf: change asset --- apps/assets/serializers/asset/common.py | 17 +---------------- run_server.py | 4 ++-- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/apps/assets/serializers/asset/common.py b/apps/assets/serializers/asset/common.py index 0e8acfe12..9c0871b87 100644 --- a/apps/assets/serializers/asset/common.py +++ b/apps/assets/serializers/asset/common.py @@ -97,25 +97,10 @@ class AssetSerializer(CategoryDisplayMixin, OrgResourceModelSerializerMixin): @classmethod def setup_eager_loading(cls, queryset): """ Perform necessary eager loading of data. """ - queryset = queryset.prefetch_related('domain', 'platform') + queryset = queryset.prefetch_related('domain', 'platform', 'protocols') queryset = queryset.prefetch_related('nodes', 'labels') return queryset - def compatible_with_old_protocol(self, validated_data): - protocols_data = validated_data.pop("protocols", []) - - # 兼容老的api - name = validated_data.get("protocol") - port = validated_data.get("port") - if not protocols_data and name and port: - protocols_data.insert(0, '/'.join([name, str(port)])) - elif not name and not port and protocols_data: - protocol = protocols_data[0].split('/') - validated_data["protocol"] = protocol[0] - validated_data["port"] = int(protocol[1]) - if protocols_data: - validated_data["protocols"] = protocols_data - def perform_nodes_display_create(self, instance, nodes_display): if not nodes_display: return diff --git a/run_server.py b/run_server.py index c7ec7bccb..4f4d3dbaa 100644 --- a/run_server.py +++ b/run_server.py @@ -6,6 +6,6 @@ import subprocess if __name__ == '__main__': - subprocess.call('python3 jms start all', shell=True, - stdin=sys.stdin, stdout=sys.stdout) + kwargs = dict(shell=True, stdin=sys.stdin, stdout=sys.stdout) + subprocess.call('python3 jms start all', **kwargs)