river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-08-26 12:57:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

重构

Browse Source
This commit is contained in:
Jing Ling
2020-01-07 01:34:43 +08:00
parent c16bcada89
commit ae8a7a65d0
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oneforall/common/request.py
+4 -6
View File
@@ -141,13 +141,11 @@ def get_title(markup):
def request_callback(future, index, datas): def request_callback(future, index, datas):
try:
result = future.result() result = future.result()
except Exception as e: if isinstance(result, Exception):
logger.log('TRACE', e.args) logger.log('TRACE', result.args)
datas[index]['reason'] = str(e.args) datas[index]['reason'] = str(result.args)
datas[index]['valid'] = 0 datas[index]['valid'] = 0
else:
if isinstance(result, tuple): if isinstance(result, tuple):
resp, text = result resp, text = result
datas[index]['reason'] = resp.reason datas[index]['reason'] = resp.reason
@@ -166,7 +164,7 @@ def request_callback(future, index, datas):
datas[index]['header'] = str(dict(headers))[1:-1] datas[index]['header'] = str(dict(headers))[1:-1]
datas[index]['response'] = utils.remove_string(text) datas[index]['response'] = utils.remove_string(text)
else: else:
datas[index]['reason'] = 'Something error' datas[index]['reason'] = str(result)
datas[index]['valid'] = 0 datas[index]['valid'] = 0
oneforall/common/resolve.py
+3
View File
@@ -71,6 +71,9 @@ def resolve_callback(future, index, datas):
if isinstance(answer, tuple): if isinstance(answer, tuple):
ips = answer[2] ips = answer[2]
datas[index]['ips'] = str(ips)[1:-1] datas[index]['ips'] = str(ips)[1:-1]
else:
datas[index]['reason'] = str(answer)
datas[index]['valid'] = 0
async def bulk_query_a(datas): async def bulk_query_a(datas):