Commit f3df8adb authored by ibuler's avatar ibuler

[Bugfix] 修复连接超时等异常引起的问题

parent d2b59e37
...@@ -61,9 +61,9 @@ class SSHConnection: ...@@ -61,9 +61,9 @@ class SSHConnection:
system_user.username, asset.ip, asset.port, system_user.username, asset.ip, asset.port,
password_short, key_fingerprint, password_short, key_fingerprint,
)) ))
return None, str(e) return None, None, str(e)
except (socket.error, TimeoutError) as e: except (socket.error, TimeoutError) as e:
return None, str(e) return None, None, str(e)
return ssh, sock, None return ssh, sock, None
def get_transport(self, asset, system_user): def get_transport(self, asset, system_user):
...@@ -88,7 +88,8 @@ class SSHConnection: ...@@ -88,7 +88,8 @@ class SSHConnection:
else: else:
return None, sock, msg return None, sock, msg
def get_proxy_sock_v2(self, asset): @staticmethod
def get_proxy_sock_v2(asset):
sock = None sock = None
domain = app_service.get_domain_detail_with_gateway( domain = app_service.get_domain_detail_with_gateway(
asset.domain asset.domain
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment