From fc595bc4e469b89f6af06384faa89eeed3e8ed95 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 15 Aug 2023 18:50:48 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=90=AF=E5=8A=A8=20ssh=20=E9=9A=A7?= =?UTF-8?q?=E9=81=93=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20(#11287)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/assets/automations/base/manager.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/assets/automations/base/manager.py b/apps/assets/automations/base/manager.py index 2107e6e56..4d35c9121 100644 --- a/apps/assets/automations/base/manager.py +++ b/apps/assets/automations/base/manager.py @@ -9,7 +9,7 @@ import yaml from django.conf import settings from django.utils import timezone from django.utils.translation import gettext as _ -from sshtunnel import SSHTunnelForwarder, BaseSSHTunnelForwarderError +from sshtunnel import SSHTunnelForwarder from assets.automations.methods import platform_automation_methods from common.utils import get_logger, lazyproperty, is_openssh_format_key, ssh_pubkey_gen @@ -265,19 +265,18 @@ class BasePlaybookManager: jms_asset, jms_gateway = host.get('jms_asset'), host.get('gateway') if not jms_gateway: continue - - server = SSHTunnelForwarder( - (jms_gateway['address'], jms_gateway['port']), - ssh_username=jms_gateway['username'], - ssh_password=jms_gateway['secret'], - ssh_pkey=jms_gateway['private_key_path'], - remote_bind_address=(jms_asset['address'], jms_asset['port']) - ) try: + server = SSHTunnelForwarder( + (jms_gateway['address'], jms_gateway['port']), + ssh_username=jms_gateway['username'], + ssh_password=jms_gateway['secret'], + ssh_pkey=jms_gateway['private_key_path'], + remote_bind_address=(jms_asset['address'], jms_asset['port']) + ) server.start() - except BaseSSHTunnelForwarderError: + except Exception as e: err_msg = 'Gateway is not active: %s' % jms_asset.get('name', '') - print('\033[31m %s \033[0m\n' % err_msg) + print(f'\033[31m {err_msg} 原因: {e} \033[0m\n') not_valid.append(k) else: host['ansible_host'] = jms_asset['address'] = '127.0.0.1'