Expect OSError during socket shutdown, can happen if other end has …

…already closed the socket
abhinavsingh · Jan 12, 2022 · ddaf616 · ddaf616
1 parent 3ec66ea
commit ddaf616
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/proxy/core/connection/pool.py b/proxy/core/connection/pool.py
@@ -174,7 +174,10 @@ def _remove(self, fileno: int) -> None:
         """Remove a connection by descriptor from the internal data structure."""
         conn = self.connections[fileno]
         logger.debug('Removing conn#{0} from pool'.format(id(conn)))
-        conn.connection.shutdown(socket.SHUT_WR)
+        try:
+            conn.connection.shutdown(socket.SHUT_WR)
+        except OSError:
+            pass
         conn.close()
         self.pools[conn.addr].remove(conn)
         del self.connections[fileno]
diff --git a/proxy/http/websocket/client.py b/proxy/http/websocket/client.py
@@ -115,5 +115,8 @@ def run(self) -> None:
         finally:
             if not self.closed:
                 self.selector.unregister(self.sock)
-                self.sock.shutdown(socket.SHUT_WR)
+                try:
+                    self.sock.shutdown(socket.SHUT_WR)
+                except OSError:
+                    pass
             self.sock.close()