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

generic_ws: fix data server close and enable custom event emitter

Browse Source
This commit is contained in:
Jacob Plaster
2019-07-25 11:15:44 +07:00
parent e88e8a3314
commit 11be0577d6
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bfxapi/client.py
View File

@@ -19,11 +19,10 @@ class Client:
""" """
def __init__(self, API_KEY=None, API_SECRET=None, rest_host=REST_HOST, def __init__(self, API_KEY=None, API_SECRET=None, rest_host=REST_HOST,
ws_host=WS_HOST, loop=None, logLevel='INFO', dead_man_switch=False, ws_host=WS_HOST, create_event_emitter=None, logLevel='INFO', dead_man_switch=False,
ws_capacity=25, *args, **kwargs): ws_capacity=25, *args, **kwargs):
self.loop = loop or asyncio.get_event_loop()
self.ws = BfxWebsocket(API_KEY=API_KEY, API_SECRET=API_SECRET, host=ws_host, self.ws = BfxWebsocket(API_KEY=API_KEY, API_SECRET=API_SECRET, host=ws_host,
loop=self.loop, logLevel=logLevel, dead_man_switch=dead_man_switch, logLevel=logLevel, dead_man_switch=dead_man_switch,
ws_capacity=ws_capacity, *args, **kwargs) ws_capacity=ws_capacity, create_event_emitter=create_event_emitter, *args, **kwargs)
self.rest = BfxRest(API_KEY=API_KEY, API_SECRET=API_SECRET, host=rest_host, self.rest = BfxRest(API_KEY=API_KEY, API_SECRET=API_SECRET, host=rest_host,
loop=self.loop, logLevel=logLevel, *args, **kwargs) logLevel=logLevel, *args, **kwargs)

3
bfxapi/tests/helpers.py
View File

@@ -1,6 +1,7 @@
import time import time
import json import json
import asyncio import asyncio
from pyee import EventEmitter
from .. import Client, BfxWebsocket, Socket from .. import Client, BfxWebsocket, Socket
@@ -8,7 +9,7 @@ def get_now():
return int(round(time.time() * 1000)) return int(round(time.time() * 1000))
def ev_worker_override(): def ev_worker_override():
return asyncio.get_event_loop() return EventEmitter()
class StubbedWebsocket(BfxWebsocket): class StubbedWebsocket(BfxWebsocket):

14
bfxapi/websockets/generic_websocket.py
View File

@@ -60,7 +60,8 @@ def _start_event_worker():
event_loop = asyncio.new_event_loop() event_loop = asyncio.new_event_loop()
worker = Thread(target=start_loop, args=(event_loop,)) worker = Thread(target=start_loop, args=(event_loop,))
worker.start() worker.start()
return event_loop ee = EventEmitter(scheduler=asyncio.ensure_future, loop=event_loop)
return ee
class GenericWebsocket: class GenericWebsocket:
""" """
@@ -68,11 +69,9 @@ class GenericWebsocket:
Inlcudes an event emitter and a standard websocket client. Inlcudes an event emitter and a standard websocket client.
""" """
def __init__(self, host, logLevel='INFO', loop=None, max_retries=5, def __init__(self, host, logLevel='INFO', max_retries=5, create_event_emitter=None):
create_event_emitter=_start_event_worker):
self.host = host self.host = host
self.logger = CustomLogger('BfxWebsocket', logLevel=logLevel) self.logger = CustomLogger('BfxWebsocket', logLevel=logLevel)
self.loop = loop or asyncio.get_event_loop()
# overide 'error' event to stop it raising an exception # overide 'error' event to stop it raising an exception
# self.events.on('error', self.on_error) # self.events.on('error', self.on_error)
self.ws = None self.ws = None
@@ -80,8 +79,8 @@ class GenericWebsocket:
self.attempt_retry = True self.attempt_retry = True
self.sockets = {} self.sockets = {}
# start seperate process for the even emitter # start seperate process for the even emitter
eventLoop = create_event_emitter() create_ee = create_event_emitter or _start_event_worker
self.events = EventEmitter(scheduler=asyncio.ensure_future, loop=eventLoop) self.events = create_ee()
def run(self): def run(self):
""" """
@@ -198,7 +197,8 @@ class GenericWebsocket:
""" """
self.logger.info("Websocket closed.") self.logger.info("Websocket closed.")
self.attempt_retry = False self.attempt_retry = False
await self.ws.close() for key, socket in self.sockets.items():
await socket.ws.close()
self._emit('done') self._emit('done')
async def on_open(self): async def on_open(self):