解决判断问题

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