From 03c0d2edbd6c30895543df31d0ae34e43a9836ff Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 31 Jan 2023 18:51:04 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=94=B9=20connectivity?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/accounts/automations/verify_account/manager.py | 4 ++-- apps/assets/automations/ping/manager.py | 6 +++--- apps/assets/automations/ping_gateway/manager.py | 10 +++++----- apps/assets/const/automation.py | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/accounts/automations/verify_account/manager.py b/apps/accounts/automations/verify_account/manager.py index 12c247849..fc25794bf 100644 --- a/apps/accounts/automations/verify_account/manager.py +++ b/apps/accounts/automations/verify_account/manager.py @@ -1,7 +1,7 @@ from django.db.models import QuerySet -from common.utils import get_logger from accounts.const import AutomationTypes, Connectivity +from common.utils import get_logger from ..base.manager import PushOrVerifyHostCallbackMixin, AccountBasePlaybookManager logger = get_logger(__name__) @@ -29,4 +29,4 @@ class VerifyAccountManager(PushOrVerifyHostCallbackMixin, AccountBasePlaybookMan def on_host_error(self, host, error, result): account = self.host_account_mapper.get(host) - account.set_connectivity(Connectivity.FAILED) + account.set_connectivity(Connectivity.ERR) diff --git a/apps/assets/automations/ping/manager.py b/apps/assets/automations/ping/manager.py index 305771f0b..0f166d0ad 100644 --- a/apps/assets/automations/ping/manager.py +++ b/apps/assets/automations/ping/manager.py @@ -1,5 +1,5 @@ -from common.utils import get_logger from assets.const import AutomationTypes, Connectivity +from common.utils import get_logger from ..base.manager import BasePlaybookManager logger = get_logger(__name__) @@ -28,7 +28,7 @@ class PingManager(BasePlaybookManager): def on_host_error(self, host, error, result): asset, account = self.host_asset_and_account_mapper.get(host) - asset.set_connectivity(Connectivity.FAILED) + asset.set_connectivity(Connectivity.ERR) if not account: return - account.set_connectivity(Connectivity.FAILED) + account.set_connectivity(Connectivity.ERR) diff --git a/apps/assets/automations/ping_gateway/manager.py b/apps/assets/automations/ping_gateway/manager.py index 5ffbc2734..858717665 100644 --- a/apps/assets/automations/ping_gateway/manager.py +++ b/apps/assets/automations/ping_gateway/manager.py @@ -1,12 +1,12 @@ import socket -import paramiko +import paramiko from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -from common.utils import get_logger -from assets.models import Gateway from assets.const import AutomationTypes, Connectivity +from assets.models import Gateway +from common.utils import get_logger logger = get_logger(__name__) @@ -100,10 +100,10 @@ class PingGatewayManager: @staticmethod def on_host_error(gateway, account, error): logger.info('\033[31m {} -> {} 原因: {} \033[0m\n'.format(gateway, account, error)) - gateway.set_connectivity(Connectivity.FAILED) + gateway.set_connectivity(Connectivity.ERR) if not account: return - account.set_connectivity(Connectivity.FAILED) + account.set_connectivity(Connectivity.ERR) @staticmethod def before_runner_start(): diff --git a/apps/assets/const/automation.py b/apps/assets/const/automation.py index a811cb50b..831b11b66 100644 --- a/apps/assets/const/automation.py +++ b/apps/assets/const/automation.py @@ -3,9 +3,9 @@ from django.utils.translation import ugettext_lazy as _ class Connectivity(TextChoices): - UNKNOWN = 'unknown', _('Unknown') + UNKNOWN = '-', _('Unknown') OK = 'ok', _('Ok') - FAILED = 'failed', _('Failed') + ERR = 'err', _('Error') class AutomationTypes(TextChoices):