fix: Buffer req on ws closed exception just like normal disconnect in bybit gw
This commit is contained in:
1 parent
30276066f8
commit
63291d7374
1 file changed
+11
-41
@@ -737,33 +737,8 @@ class BybitExecutionGateway(ExecutionGateway):
|
||||
return
|
||||
except websocket.WebSocketConnectionClosedException as e:
|
||||
self.logger.error("[bybit_gw_crt_err.json]%s" % SLog(err=str(e)))
|
||||
# Handle websocket closed, signal to algos we are reconnecting
|
||||
if self.bridge:
|
||||
er = PyExecutionReport()
|
||||
ts = time.time_ns()
|
||||
er.set_data(
|
||||
key=req.key(),
|
||||
account=self.account,
|
||||
exchange_order_id="",
|
||||
exchange_security_id=req.exchange_security_id(),
|
||||
venue=req.venue(),
|
||||
security_type=req.security_type(),
|
||||
order_type=req.order_type(),
|
||||
order_status=OrderStatus.REJECTED.name,
|
||||
time_in_force=req.time_in_force(),
|
||||
exec_type=ExecType.REJECTED.name,
|
||||
is_buy=req.is_buy(),
|
||||
price=req.price(),
|
||||
quantity=req.quantity(),
|
||||
filled_quantity=0.0,
|
||||
last_filled_quantity=0.0,
|
||||
last_filled_price=0.0,
|
||||
avg_filled_price=0.0,
|
||||
transact_id=ts,
|
||||
transact_time=ts,
|
||||
)
|
||||
er.set_error_msg("RECONNECTING")
|
||||
self.bridge.on_execution_report(er)
|
||||
# Handle websocket closed. Buffer request until we reconnect
|
||||
self._buffer_request(req)
|
||||
|
||||
def cancel_replace_order(self, req: PyCancelReplaceOrderRequest):
|
||||
self.logger.info("[bybit_gw_cxlrep_ord.json]%s" % req)
|
||||
@@ -796,19 +771,8 @@ class BybitExecutionGateway(ExecutionGateway):
|
||||
return
|
||||
except websocket.WebSocketConnectionClosedException as e:
|
||||
self.logger.error("[bybit_cxlrep_err.json]%s" % SLog(err=str(e)))
|
||||
# Handle websocket closed, signal to algos we are reconnecting
|
||||
ord_data = self.orders.get(bts_id=bts_id)
|
||||
if not ord_data:
|
||||
self.logger.error(
|
||||
"[bybit_cxlrep_err.json]%s"
|
||||
% SLog(err="Order not found with id %s" % req.exchange_order_id())
|
||||
)
|
||||
return
|
||||
ord_data.status = OrderStatus.REJECTED
|
||||
if self.exe_report_callback:
|
||||
er = ord_data.to_execution_report()
|
||||
er.set_error_msg("RECONNECTING")
|
||||
self.exe_report_callback(er)
|
||||
# Handle websocket closed. Buffer request until we reconnect
|
||||
self._buffer_request(req)
|
||||
|
||||
def cancel_order(self, req: PyCancelOrderRequest):
|
||||
self.logger.info("[bybit_gw_cxl_ord.json]%s" % req)
|
||||
@@ -834,7 +798,13 @@ class BybitExecutionGateway(ExecutionGateway):
|
||||
self.buffered_requests[req.key()] = req
|
||||
return
|
||||
self.logger.info("[bybit_gw_cxl_ord_send.json]%s" % SLog(params=params))
|
||||
self.trade_cli.cancel_order(on_ack, **params, error_callback=on_err)
|
||||
try:
|
||||
self.trade_cli.cancel_order(on_ack, **params, error_callback=on_err)
|
||||
return
|
||||
except websocket.WebSocketConnectionClosedException as e:
|
||||
self.logger.error("[bybit_cxl_err.json]%s" % SLog(err=str(e)))
|
||||
# Handle websocket closed. Buffer request until we reconnect
|
||||
self._buffer_request(req)
|
||||
|
||||
def on_securities(self, securities: PySecurityList):
|
||||
self.logger.info("[bybit_gw_sec.json]%s" % securities)
|
||||
|
||||
Reference in new issue
Block a user