Merge pull request #157 from jumpserver/dev

Dev

Merge pull request #157 from jumpserver/dev
Dev
3120cdb5 · 老广 · GitHub · 5365a8f0 · d091e0ce · 3120cdb5
Unverified Commit 3120cdb5 authored Dec 26, 2018 by 老广 Committed by GitHub Dec 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

sshd.py coco/sshd.py +4 -2

No files found.
--- a/coco/sshd.py
+++ b/coco/sshd.py
@@ -92,10 +92,12 @@ class SSHServer:
                t.daemon = True
                t.start()
            transport.close()
-        except (paramiko.SSHException, sock.timeout):
+        except (paramiko.SSHException, socket.timeout):
            logger.warning("SSH negotiation failed")
        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:
            Connection.remove_connection(connection.id)
            sock.close()