Dev to Main: corrections #2

Merged
das merged 3 commits from dev into main 2025-02-18 10:25:40 +02:00
6 changed files with 12 additions and 7 deletions

7
.gitignore vendored
View File

@ -1,9 +1,8 @@
.idea .idea
.venv .venv
/data/ /data/
/configs/config.json /configs/config.*
/configs/config.yaml /configs/metrics.*
/configs/metrics.json /configs/metrics_win.*
/configs/metrics_win.json
/__pycache__/ /__pycache__/
/metrics/__pycache__/ /metrics/__pycache__/

View File

@ -35,7 +35,7 @@ def read_prop(filepath, sep='=', comment_char='#'):
conf[key] = value conf[key] = value
return conf return conf
def read_yaml(name): #ToDo: need to be tested! def read_yaml(name):
conf = {} conf = {}
with open(name, 'r') as f: with open(name, 'r') as f:
y_conf = yaml.safe_load(f) y_conf = yaml.safe_load(f)

View File

@ -4,6 +4,7 @@ from abc import abstractmethod
import time import time
import platform import platform
import subprocess import subprocess
from linecache import cache
import requests import requests
import psutil import psutil
@ -113,8 +114,13 @@ def get_shell_value(command, args, callback=None):
def is_ping(ip, count, callback=None): def is_ping(ip, count, callback=None):
param = '-n' if platform.system().lower() == 'windows' else '-c' param = '-n' if platform.system().lower() == 'windows' else '-c'
command = ['ping', param, str(count), ip] command = ['ping', param, str(count), ip]
output = subprocess.check_output(command) try:
result = 'unreachable' not in str(output) and 'could not find' not in str(output) and 'time out' not in str(output) output = subprocess.check_output(command)
result = ('unreachable'.upper() not in str(output).upper() and
'could not find'.upper() not in str(output).upper() and
'time out'.upper() not in str(output).upper())
except:
result = False
if callback is not None: if callback is not None:
callback(result) callback(result)
else: else: