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

修复reason记录问题

Browse Source
This commit is contained in:
Jing Ling
2020-01-08 23:00:39 +08:00
parent 3220b363bf
commit 9386643c5d
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oneforall/common/request.py
+4 -6
View File
@@ -142,11 +142,12 @@ def get_title(markup):
def request_callback(future, index, datas): def request_callback(future, index, datas):
result = future.result() result = future.result()
if isinstance(result, Exception): if isinstance(result, BaseException):
logger.log('TRACE', result.args) logger.log('TRACE', result.args)
datas[index]['reason'] = str(result.args) name = utils.get_classname(result)
datas[index]['reason'] = name + ' ' + str(result)
datas[index]['valid'] = 0 datas[index]['valid'] = 0
if isinstance(result, tuple): elif isinstance(result, tuple):
resp, text = result resp, text = result
datas[index]['reason'] = resp.reason datas[index]['reason'] = resp.reason
datas[index]['status'] = resp.status datas[index]['status'] = resp.status
@@ -163,9 +164,6 @@ def request_callback(future, index, datas):
datas[index]['title'] = utils.remove_string(title) datas[index]['title'] = utils.remove_string(title)
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:
datas[index]['reason'] = str(result)
datas[index]['valid'] = 0
def get_connector(): def get_connector():
oneforall/common/resolve.py
+6 -6
View File
@@ -6,6 +6,7 @@ import tqdm
from dns.resolver import Resolver from dns.resolver import Resolver
import config import config
from common import utils
from config import logger from config import logger
@@ -65,15 +66,14 @@ def resolve_callback(future, index, datas):
:param datas: 结果集 :param datas: 结果集
""" """
hostname, answer = future.result() hostname, answer = future.result()
if isinstance(answer, Exception): if isinstance(answer, BaseException):
datas[index]['reason'] = str(answer.args) logger.log('TRACE', answer.args)
name = utils.get_classname(answer)
datas[index]['reason'] = name + ' ' + str(answer)
datas[index]['valid'] = 0 datas[index]['valid'] = 0
if isinstance(answer, tuple): elif 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):
oneforall/common/utils.py
+4
View File
@@ -282,3 +282,7 @@ def export_all(format, datas):
def get_timestamp(): def get_timestamp():
return int(time.time()) return int(time.time())
def get_classname(clsobj):
return clsobj.__class__.__name__