river_tao/OneForAll-mirror
1
0
Fork 0
mirror of https://github.com/shmilylty/OneForAll.git synced 2026-10-25 00:56:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

解决判断问题

Browse Source
This commit is contained in:
Jing Ling
2020-04-07 21:09:47 +08:00
parent 29b12196c4
commit 69e7efa02c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oneforall/common/resolve.py
+4 -3
View File
@@ -57,19 +57,20 @@ def convert_results(result_list):
result_dict = {} result_dict = {}
for result in result_list: for result in result_list:
hostname, answer = result hostname, answer = result
value_dict = {'content': None, 'reason': None, value_dict = {'content': None, 'reason': None, 'resolve': None,
'public': None, 'valid': None} 'public': None, 'valid': None}
if isinstance(answer, tuple): if isinstance(answer, tuple):
ip_list = answer[2] ip_list = answer[2]
value_dict['content'] = ','.join(ip_list) value_dict['content'] = ','.join(ip_list)
value_dict['public'] = utils.check_ip_public(ip_list) value_dict['public'] = utils.check_ip_public(ip_list)
value_dict['resolve'] = 1
result_dict[hostname] = value_dict result_dict[hostname] = value_dict
elif isinstance(answer, Exception): elif isinstance(answer, Exception):
value_dict['reason'] = str(answer.args) value_dict['reason'] = str(answer.args)
value_dict['valid'] = 0 value_dict['resolve'] = 0
result_dict[hostname] = value_dict result_dict[hostname] = value_dict
else: else:
value_dict['valid'] = 0 value_dict['resolve'] = 0
result_dict[hostname] = value_dict result_dict[hostname] = value_dict
return result_dict return result_dict