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

[功能增强] 某个服务器出错时，强制更换

Browse Source
This commit is contained in:
msincenselee 2020-05-26 09:31:14 +08:00
parent 63d9ea4da7
commit 1c2c21812f
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
vnpy/data/tdx/tdx_future_data.py
View File

@ -130,25 +130,37 @@ class TdxFutureData(object):
self.write_log(u'开始连接通达信行情服务器') self.write_log(u'开始连接通达信行情服务器')
self.api = TdxExHq_API(heartbeat=True, auto_retry=True, raise_exception=True) self.api = TdxExHq_API(heartbeat=True, auto_retry=True, raise_exception=True)
exclude_ips = []
# 选取最佳服务器 # 选取最佳服务器
if is_reconnect or len(self.best_ip) == 0: if is_reconnect or len(self.best_ip) == 0:
self.best_ip = get_cache_json(TDX_FUTURE_CONFIG) self.best_ip = get_cache_json(TDX_FUTURE_CONFIG)
last_datetime_str = self.best_ip.get('datetime', None)
if last_datetime_str: if is_reconnect:
try: if is_reconnect:
last_datetime = datetime.strptime(last_datetime_str, '%Y-%m-%d %H:%M:%S') exclude_ips.append(self.best_ip.get('ip'))
if (datetime.now() - last_datetime).total_seconds() > 60 * 60 * 2:
self.best_ip = {}
except Exception as ex: # noqa
self.best_ip = {}
else:
self.best_ip = {} self.best_ip = {}
else:
# 超时的话，重新选择
last_datetime_str = self.best_ip.get('datetime', None)
if last_datetime_str:
try:
last_datetime = datetime.strptime(last_datetime_str, '%Y-%m-%d %H:%M:%S')
if (datetime.now() - last_datetime).total_seconds() > 60 * 60 * 2:
self.best_ip = {}
except Exception as ex: # noqa
self.best_ip = {}
else:
self.best_ip = {}
if len(self.best_ip) == 0: if len(self.best_ip) == 0:
self.best_ip = self.select_best_ip() self.best_ip = self.select_best_ip(exclude_ips)
self.write_log(f'选取服务器:{self.best_ip}')
else:
self.write_log(f'使用缓存服务器:{self.best_ip}')
# 如果配置proxy5，使用vnpy项目下的pytdx # 如果配置proxy5，使用vnpy项目下的pytdx
if len(self.proxy_ip) > 0 and self.proxy_port > 0: if len(self.proxy_ip) > 0 and self.proxy_port > 0:
self.write_log(f'使用proxy5代理 {self.proxy_ip}:{self.proxy_port}')
self.api.connect(ip=self.best_ip['ip'], port=self.best_ip['port'], self.api.connect(ip=self.best_ip['ip'], port=self.best_ip['port'],
proxy_ip=self.proxy_ip, proxy_port=self.proxy_port) proxy_ip=self.proxy_ip, proxy_port=self.proxy_port)
else: else:
@ -198,14 +210,14 @@ class TdxFutureData(object):
return timedelta(9, 9, 0) return timedelta(9, 9, 0)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
def select_best_ip(self): def select_best_ip(self, exclude_ips=[]):
""" """
选择行情服务器 选择行情服务器
:return: :return:
""" """
self.write_log(u'选择通达信行情服务器') self.write_log(u'选择通达信行情服务器')
data_future = [self.ping(x['ip'], x['port']) for x in TDX_FUTURE_HOSTS] data_future = [self.ping(x['ip'], x['port']) for x in TDX_FUTURE_HOSTS if x['ip'] not in exclude_ips]
best_future_ip = TDX_FUTURE_HOSTS[data_future.index(min(data_future))] best_future_ip = TDX_FUTURE_HOSTS[data_future.index(min(data_future))]
@ -478,14 +490,20 @@ class TdxFutureData(object):
index = 0 index = 0
count = 100 count = 100
results = [] results = []
while (True): try:
print(u'查询{}下：{}~{}个合约'.format(exchange, index, index + count)) while (True):
result = self.api.get_instrument_quote_list(int(market_id), 3, index, count) print(u'查询{}下：{}~{}个合约'.format(exchange, index, index + count))
results.extend(result) result = self.api.get_instrument_quote_list(int(market_id), 3, index, count)
index += count results.extend(result)
if len(result) < count: index += count
break if len(result) < count:
return results break
return results
except Exception as ex:
print(f'接口查询异常:{str(ex)}')
self.connect(is_reconnect=True)
return results
def get_mi_contracts2(self): def get_mi_contracts2(self):
""" 获取主力合约""" """ 获取主力合约"""