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

Merge branch 'dev' of https://github.com/vnpy/vnpy into dev

Browse Source
This commit is contained in:
vn.py 2019-09-30 11:49:04 +08:00
commit 98716eec55
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vnpy/app/cta_strategy/engine.py
View File

@ -91,7 +91,7 @@ class CtaEngine(BaseEngine):
self.stop_order_count = 0 # for generating stop_orderid self.stop_order_count = 0 # for generating stop_orderid
self.stop_orders = {} # stop_orderid: stop_order self.stop_orders = {} # stop_orderid: stop_order
self.init_executor = ThreadPoolExecutor(max_workers=3) self.init_executor = ThreadPoolExecutor(max_workers=1)
self.rq_client = None self.rq_client = None
self.rq_symbols = set() self.rq_symbols = set()

8
vnpy/trader/rqdata.py
View File

@ -49,8 +49,12 @@ class RqdataClient:
if not self.username or not self.password: if not self.username or not self.password:
return False return False
rqdata_init(self.username, self.password, rqdata_init(
('rqdatad-pro.ricequant.com', 16011)) self.username,
self.password,
('rqdatad-pro.ricequant.com', 16011),
use_pool=True
)
try: try:
df = rqdata_all_instruments(date=datetime.now()) df = rqdata_all_instruments(date=datetime.now())