|
@@ -16,6 +16,7 @@ import psutil
|
|
|
import ujson
|
|
import ujson
|
|
|
import broker
|
|
import broker
|
|
|
from decimal import Decimal
|
|
from decimal import Decimal
|
|
|
|
|
+from loguru import logger
|
|
|
|
|
|
|
|
VERSION = utils.VERSION
|
|
VERSION = utils.VERSION
|
|
|
|
|
|
|
@@ -439,11 +440,11 @@ class Quant:
|
|
|
self.strategy.local_time = time.time()
|
|
self.strategy.local_time = time.time()
|
|
|
orders = self.strategy.onTime(self.tradeMsg)
|
|
orders = self.strategy.onTime(self.tradeMsg)
|
|
|
|
|
|
|
|
- if (('Limits_open' in orders and len(orders['Limits_open']) != 0) or
|
|
|
|
|
- ('Limits_close' in orders and len(orders['Limits_close']) != 0)):
|
|
|
|
|
- self.logger.info("--------------------------------update_local_order订单指令----------------------------")
|
|
|
|
|
- self.logger.info(orders)
|
|
|
|
|
- self.logger.info("-------------------------------------------end--------------------------------------")
|
|
|
|
|
|
|
+ # if (('Limits_open' in orders and len(orders['Limits_open']) != 0) or
|
|
|
|
|
+ # ('Limits_close' in orders and len(orders['Limits_close']) != 0)):
|
|
|
|
|
+ # self.logger.info("--------------------------------update_local_order订单指令----------------------------")
|
|
|
|
|
+ # self.logger.info(orders)
|
|
|
|
|
+ # self.logger.info("-------------------------------------------end--------------------------------------")
|
|
|
### 记录指令触发信息
|
|
### 记录指令触发信息
|
|
|
if self._not_empty(orders):
|
|
if self._not_empty(orders):
|
|
|
self.logger.debug("触发onOrder")
|
|
self.logger.debug("触发onOrder")
|
|
@@ -586,6 +587,7 @@ class Quant:
|
|
|
|
|
|
|
|
# @utils.timeit
|
|
# @utils.timeit
|
|
|
async def _update_depth(self, data):
|
|
async def _update_depth(self, data):
|
|
|
|
|
+ # logger.info(data)
|
|
|
'''
|
|
'''
|
|
|
update orderbook infomation
|
|
update orderbook infomation
|
|
|
'''
|
|
'''
|
|
@@ -636,11 +638,11 @@ class Quant:
|
|
|
self.strategy.local_time = time.time()
|
|
self.strategy.local_time = time.time()
|
|
|
# 产生交易信号
|
|
# 产生交易信号
|
|
|
orders = self.strategy.onTime(self.tradeMsg)
|
|
orders = self.strategy.onTime(self.tradeMsg)
|
|
|
- if (('Limits_open' in orders and len(orders['Limits_open']) != 0) or
|
|
|
|
|
- ('Limits_close' in orders and len(orders['Limits_close']) != 0)):
|
|
|
|
|
- self.logger.info("--------------------------------_update_depth订单指令--------------------------------")
|
|
|
|
|
- self.logger.info(orders)
|
|
|
|
|
- self.logger.info("-------------------------------------------end--------------------------------------")
|
|
|
|
|
|
|
+ # if (('Limits_open' in orders and len(orders['Limits_open']) != 0) or
|
|
|
|
|
+ # ('Limits_close' in orders and len(orders['Limits_close']) != 0)):
|
|
|
|
|
+ # self.logger.info("--------------------------------_update_depth订单指令--------------------------------")
|
|
|
|
|
+ # self.logger.info(orders)
|
|
|
|
|
+ # self.logger.info("-------------------------------------------end--------------------------------------")
|
|
|
### 记录指令触发信息
|
|
### 记录指令触发信息
|
|
|
if self._not_empty(orders):
|
|
if self._not_empty(orders):
|
|
|
self.logger.debug("触发onTick")
|
|
self.logger.debug("触发onTick")
|