From 6a20e2f578387df962d99c50e2f7bf08605b6019 Mon Sep 17 00:00:00 2001 From: pycook Date: Tue, 14 Jan 2025 16:24:20 +0800 Subject: [PATCH] fix(api): auto discovery rules sync --- cmdb-api/api/views/cmdb/auto_discovery.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmdb-api/api/views/cmdb/auto_discovery.py b/cmdb-api/api/views/cmdb/auto_discovery.py index 5ca38594..28b926c0 100644 --- a/cmdb-api/api/views/cmdb/auto_discovery.py +++ b/cmdb-api/api/views/cmdb/auto_discovery.py @@ -30,6 +30,7 @@ from api.lib.cmdb.search.ci import search as ci_search from api.lib.decorator import args_required from api.lib.decorator import args_validate +from api.lib.exception import AbortException from api.lib.perm.acl.acl import has_perm_from_args from api.lib.utils import AESCrypto from api.lib.utils import get_page @@ -296,7 +297,10 @@ def get(self): rules, last_update_at1 = AutoDiscoveryCITypeCRUD.get(None, oneagent_id, oneagent_name, last_update_at) - subnet_scan_rules, last_update_at2 = SubnetManager().scan_rules(oneagent_id, last_update_at) + try: + subnet_scan_rules, last_update_at2 = SubnetManager().scan_rules(oneagent_id, last_update_at) + except AbortException: + subnet_scan_rules, last_update_at2 = [], "" return self.jsonify(rules=rules, subnet_scan_rules=subnet_scan_rules,