This commit is contained in:
JrD
2020-09-24 14:26:19 +08:00
parent b1e1a107f3
commit 6a831c07ab
+6
View File
@@ -748,12 +748,18 @@ def ping_avg_time(nameserver):
logger.log('ALERT', f'100.0% packet loss, ping {nameserver} failed.') logger.log('ALERT', f'100.0% packet loss, ping {nameserver} failed.')
return None return None
elif platform.system() in ('Darwin', 'Linux'): elif platform.system() in ('Darwin', 'Linux'):
try:
avg_time = re.findall(r'(?:min/avg/max/.+ )(?:\d+\.\d+)/(\d+\.\d+)/', text)[0] avg_time = re.findall(r'(?:min/avg/max/.+ )(?:\d+\.\d+)/(\d+\.\d+)/', text)[0]
logger.log('INFOR', f'ping {nameserver} average time {avg_time} ms.') logger.log('INFOR', f'ping {nameserver} average time {avg_time} ms.')
except IndexError:
return None
return avg_time return avg_time
elif platform.system() == 'Windows': elif platform.system() == 'Windows':
try:
avg_time = re.findall(r'(?:Average|平均).+(\d.?)ms', text)[0] avg_time = re.findall(r'(?:Average|平均).+(\d.?)ms', text)[0]
logger.log('INFOR', f'ping {nameserver} average time {avg_time} ms.') logger.log('INFOR', f'ping {nameserver} average time {avg_time} ms.')
except IndexError:
return None
return avg_time return avg_time
else: else:
logger.log('ALERT', f'{text}') logger.log('ALERT', f'{text}')