senset/vnpy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Add] WebSocketClient:增加onDisconnected

Browse Source
This commit is contained in:
nanoric 2018-10-15 04:35:38 -04:00
parent a55246eb77
commit 4d7c3bf417
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api/base/WebSocketClientTest.py
View File

@ -17,7 +17,7 @@ class TestWebsocketClient(WebsocketClient):
self.p.set_result(packet)
pass
def onConnect(self):
def onConnected(self):
pass
def onError(self, exceptionType, exceptionValue, tb):

19
vnpy/api/websocket/WebSocketClient.py
View File

@ -43,7 +43,7 @@ class WebsocketClient(object):
self._pingThread = Thread(target=self._runPing)
self._pingThread.start()
self.onConnect()
self.onConnected()
#----------------------------------------------------------------------
def stop(self):
@ -79,7 +79,7 @@ class WebsocketClient(object):
def _connect(self):
""""""
self._ws = websocket.create_connection(self.host, sslopt={'cert_reqs': ssl.CERT_NONE})
self.onConnect()
self.onConnected()
#----------------------------------------------------------------------
def _disconnect(self):
@ -104,6 +104,7 @@ class WebsocketClient(object):
try:
stream = ws.recv()
if not stream:
self.onDisconnected()
if self._active:
self._reconnect()
continue
@ -128,9 +129,17 @@ class WebsocketClient(object):
return self._get_ws().send('ping', websocket.ABNF.OPCODE_PING)
#----------------------------------------------------------------------
@abstractmethod
def onConnect(self):
"""连接回调"""
def onConnected(self):
"""
连接成功回调
"""
pass
#----------------------------------------------------------------------
def onDisconnected(self):
"""
连接断开回调
"""
pass
#----------------------------------------------------------------------