github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 修改 connectivity

pull/9380/head
ibuler 2023-01-31 18:51:04 +08:00
parent ef51e74b8e
commit 03c0d2edbd
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/accounts/automations/verify_account/manager.py
View File

@ -1,7 +1,7 @@
from django.db.models import QuerySet from django.db.models import QuerySet
from common.utils import get_logger
from accounts.const import AutomationTypes, Connectivity from accounts.const import AutomationTypes, Connectivity
from common.utils import get_logger
from ..base.manager import PushOrVerifyHostCallbackMixin, AccountBasePlaybookManager from ..base.manager import PushOrVerifyHostCallbackMixin, AccountBasePlaybookManager
logger = get_logger(__name__) logger = get_logger(__name__)
@ -29,4 +29,4 @@ class VerifyAccountManager(PushOrVerifyHostCallbackMixin, AccountBasePlaybookMan
def on_host_error(self, host, error, result): def on_host_error(self, host, error, result):
account = self.host_account_mapper.get(host) account = self.host_account_mapper.get(host)
account.set_connectivity(Connectivity.FAILED) account.set_connectivity(Connectivity.ERR)

6
apps/assets/automations/ping/manager.py
View File

@ -1,5 +1,5 @@
from common.utils import get_logger
from assets.const import AutomationTypes, Connectivity from assets.const import AutomationTypes, Connectivity
from common.utils import get_logger
from ..base.manager import BasePlaybookManager from ..base.manager import BasePlaybookManager
logger = get_logger(__name__) logger = get_logger(__name__)
@ -28,7 +28,7 @@ class PingManager(BasePlaybookManager):
def on_host_error(self, host, error, result): def on_host_error(self, host, error, result):
asset, account = self.host_asset_and_account_mapper.get(host) asset, account = self.host_asset_and_account_mapper.get(host)
asset.set_connectivity(Connectivity.FAILED) asset.set_connectivity(Connectivity.ERR)
if not account: if not account:
return return
account.set_connectivity(Connectivity.FAILED) account.set_connectivity(Connectivity.ERR)

10
apps/assets/automations/ping_gateway/manager.py
View File

@ -1,12 +1,12 @@
import socket import socket
import paramiko
import paramiko
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ugettext_lazy as _ 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.const import AutomationTypes, Connectivity
from assets.models import Gateway
from common.utils import get_logger
logger = get_logger(__name__) logger = get_logger(__name__)
@ -100,10 +100,10 @@ class PingGatewayManager:
@staticmethod @staticmethod
def on_host_error(gateway, account, error): def on_host_error(gateway, account, error):
logger.info('\033[31m {} -> {} 原因: {} \033[0m\n'.format(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: if not account:
return return
account.set_connectivity(Connectivity.FAILED) account.set_connectivity(Connectivity.ERR)
@staticmethod @staticmethod
def before_runner_start(): def before_runner_start():

4
apps/assets/const/automation.py
View File

@ -3,9 +3,9 @@ from django.utils.translation import ugettext_lazy as _
class Connectivity(TextChoices): class Connectivity(TextChoices):
UNKNOWN = 'unknown', _('Unknown') UNKNOWN = '-', _('Unknown')
OK = 'ok', _('Ok') OK = 'ok', _('Ok')
FAILED = 'failed', _('Failed') ERR = 'err', _('Error')
class AutomationTypes(TextChoices): class AutomationTypes(TextChoices):