yshtcn/heartbeat
1
0
Fork 0
mirror of https://github.com/yshtcn/heartbeat.git synced 2025-12-14 02:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update heartbeat.py

Browse Source 
- 增加ping错误日志和回显
- 对错误的ping值进行判断
This commit is contained in:
yshtcn 2023-08-04 12:45:53 +08:00 committed by GitHub
parent 5988ef959d
commit f3652294ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
heartbeat.py
View File

@ -23,7 +23,7 @@ logger = logging.getLogger()
logger.setLevel(logging.INFO) logger.setLevel(logging.INFO)
# Create file handler # Create file handler
file_handler = logging.FileHandler(log_file_path) file_handler = logging.FileHandler(log_file_path, encoding='utf-8')
file_handler.setLevel(logging.INFO) file_handler.setLevel(logging.INFO)
# Create console handler # Create console handler
@ -61,31 +61,39 @@ def ping(host):
process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE) process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
stdout, stderr = process.communicate() stdout, stderr = process.communicate()
# Try decoding with the system's default encoding # Try decoding with GBK encoding first
try: try:
stdout = stdout.decode() stdout = stdout.decode('gbk')
except UnicodeDecodeError: except UnicodeDecodeError:
stdout = stdout.decode(sys.getdefaultencoding(), errors='ignore') stdout = stdout.decode(sys.getdefaultencoding(), errors='ignore')
ping_result = ""
for line in stdout.split('\n'): for line in stdout.split('\n'):
if 'ms' in line: if 'ms' in line:
# Extract the time value right before 'ms' # Extract the time value right before 'ms'
time_str = line.split('ms')[0].strip().split(' ')[-1] time_str = line.split('ms')[0].strip().split(' ')[-1]
# Remove any non-digit characters # Remove any non-digit characters
return ''.join(filter(str.isdigit, time_str)) ping_result = ''.join(filter(str.isdigit, time_str))
if ping_result.isdigit() and int(ping_result) < 10000:
return ping_result
logger.info(f"{datetime.now()} Ping command output: {repr(stdout)}")
return "ping failed" return "ping failed"
def heartbeat(interval, heartbeat_url, session, ping_host): def heartbeat(interval, heartbeat_url, session, ping_host):
while not stop_heartbeat.is_set(): while not stop_heartbeat.is_set():
try: try:
ping_result = "" ping_result = ""
if '{ping}' in heartbeat_url and ping_host: if '{ping}' in heartbeat_url and ping_host:
ping_result = ping(ping_host) ping_result = ping(ping_host)
final_url = heartbeat_url.format(ping=ping_result) if ping_result == "ping failed":
final_url = heartbeat_url.format(ping="")
else:
final_url = heartbeat_url.format(ping=ping_result)
else:
final_url = heartbeat_url
response = session.get(final_url) response = session.get(final_url)
logger.info(f"{datetime.now()} Ping: {ping_result}ms. Final URL: {final_url}. Response status code: {response.status_code}") logger.info(f"{datetime.now()} Ping: {ping_result}ms. Final URL: {final_url}. Response status code: {response.status_code}")
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e: