Catch broken pipes and OS errors in websocket thread (Fixes #177)

miguelgrinberg · Oct 21, 2020 · 0dde7d7 · 0dde7d7
1 parent 6ac8772
commit 0dde7d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/engineio/asyncio_client.py b/engineio/asyncio_client.py
@@ -635,7 +635,8 @@ async def _write_loop(self):
                             await self.ws.send_str(pkt.encode(
                                 always_bytes=False))
                         self.queue.task_done()
-                except aiohttp.client_exceptions.ServerDisconnectedError:
+                except (aiohttp.client_exceptions.ServerDisconnectedError,
+                        BrokenPipeError, OSError):
                     self.logger.info(
                         'Write loop: WebSocket connection was closed, '
                         'aborting')

diff --git a/engineio/client.py b/engineio/client.py
@@ -741,7 +741,8 @@ def _write_loop(self):
                         else:
                             self.ws.send(encoded_packet)
                         self.queue.task_done()
-                except websocket.WebSocketConnectionClosedException:
+                except (websocket.WebSocketConnectionClosedException,
+                        BrokenPipeError, OSError):
                     self.logger.warning(
                         'WebSocket connection was closed, aborting')
                     break