Unverified Commit 3120cdb5 authored by 老广's avatar 老广 Committed by GitHub

Merge pull request #157 from jumpserver/dev

Dev
parents 5365a8f0 d091e0ce
...@@ -92,10 +92,12 @@ class SSHServer: ...@@ -92,10 +92,12 @@ class SSHServer:
t.daemon = True t.daemon = True
t.start() t.start()
transport.close() transport.close()
except (paramiko.SSHException, sock.timeout): except (paramiko.SSHException, socket.timeout):
logger.warning("SSH negotiation failed") logger.warning("SSH negotiation failed")
except EOFError as e: except EOFError as e:
logger.warning("Handle EOF Error: {}".format(e)) logger.warning("Handle connection EOF Error: {}".format(e))
except Exception as e:
logger.error("Handle connection unexpect error occur: ".format(e))
finally: finally:
Connection.remove_connection(connection.id) Connection.remove_connection(connection.id)
sock.close() sock.close()
......
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