aljaz/bitfinex-api-py
1
0
Fork 0
mirror of https://github.com/aljazceru/bitfinex-api-py.git synced 2025-12-19 06:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in BfxWebsocketClient::close (bfxapi.websocket.client.bfx_websocket_client).

Browse Source
This commit is contained in:
Davide Casale
2023-04-16 21:16:18 +02:00
parent 6d868a8287
commit e15b52eabd
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bfxapi/websocket/client/bfx_websocket_bucket.py
View File

@@ -61,7 +61,7 @@ class BfxWebsocketBucket:
try: try:
await _connection() await _connection()
except websockets.ConnectionClosedError as error: except websockets.exceptions.ConnectionClosedError as error:
if error.code in (1006, 1012): if error.code in (1006, 1012):
self.on_open_event.clear() self.on_open_event.clear()

12
bfxapi/websocket/client/bfx_websocket_client.py
View File

@@ -152,7 +152,7 @@ class BfxWebsocketClient:
rcvd = websockets.frames.Close(code=1012, rcvd = websockets.frames.Close(code=1012,
reason="Stop/Restart Websocket Server (please reconnect).") reason="Stop/Restart Websocket Server (please reconnect).")
raise websockets.ConnectionClosedError(rcvd=rcvd, sent=None) raise websockets.exceptions.ConnectionClosedError(rcvd=rcvd, sent=None)
elif message["event"] == "auth": elif message["event"] == "auth":
if message["status"] != "OK": if message["status"] != "OK":
raise InvalidAuthenticationCredentials( raise InvalidAuthenticationCredentials(
@@ -177,8 +177,8 @@ class BfxWebsocketClient:
try: try:
await _connection() await _connection()
except (websockets.ConnectionClosedError, socket.gaierror) as error: except (websockets.exceptions.ConnectionClosedError, socket.gaierror) as error:
if isinstance(error, websockets.ConnectionClosedError) and error.code in (1006, 1012): if isinstance(error, websockets.exceptions.ConnectionClosedError) and error.code in (1006, 1012):
if error.code == 1006: if error.code == 1006:
self.logger.error("Connection lost: no close frame received " \ self.logger.error("Connection lost: no close frame received " \
"or sent (1006). Attempting to reconnect...") "or sent (1006). Attempting to reconnect...")
@@ -235,12 +235,12 @@ class BfxWebsocketClient:
await bucket.unsubscribe(chan_id=chan_id) await bucket.unsubscribe(chan_id=chan_id)
async def close(self, code=1000, reason=str()): async def close(self, code=1000, reason=str()):
if self.websocket is not None and self.websocket.open:
await self.websocket.close(code=code, reason=reason)
for bucket in self.buckets: for bucket in self.buckets:
await bucket.close(code=code, reason=reason) await bucket.close(code=code, reason=reason)
if self.websocket is not None and self.websocket.open:
await self.websocket.close(code=code, reason=reason)
@_require_websocket_authentication @_require_websocket_authentication
async def notify(self, info, message_id=None, **kwargs): async def notify(self, info, message_id=None, **kwargs):
await self.websocket.send(json.dumps([ 0, "n", message_id, { "type": "ucm-test", "info": info, **kwargs } ])) await self.websocket.send(json.dumps([ 0, "n", message_id, { "type": "ucm-test", "info": info, **kwargs } ]))