server: Close the socket even if shutdown() raises an exception.

2018-10-19 18:05:08 +02:00 · 2018-10-19 18:05:08 +02:00 · a46a50fd74
commit a46a50fd74
parent fbf56d3491
1 changed files with 5 additions and 1 deletions
--- a/matrix/server.py
+++ b/matrix/server.py
@ -459,10 +459,14 @@ class MatrixServer(object):
        if self.socket:
            try:
                self.socket.shutdown(socket.SHUT_RDWR)
-                self.socket.close()
            except socket.error:
                pass

+            try:
+                self.socket.close()
+            except OSError:
+                pass
+
    def disconnect(self, reconnect=True):
        # type: (bool) -> None
        if self.fd_hook: