diff --git a/.gitignore b/.gitignore index 8762eb7..a2a56f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,8 @@ .idea .venv /data/ -/configs/config.json -/configs/config.yaml -/configs/metrics.json -/configs/metrics_win.json +/configs/config.* +/configs/metrics.* +/configs/metrics_win.* /__pycache__/ /metrics/__pycache__/ \ No newline at end of file diff --git a/config_file.py b/config_file.py index 0271383..718fb9b 100755 --- a/config_file.py +++ b/config_file.py @@ -35,7 +35,7 @@ def read_prop(filepath, sep='=', comment_char='#'): conf[key] = value return conf -def read_yaml(name): #ToDo: need to be tested! +def read_yaml(name): conf = {} with open(name, 'r') as f: y_conf = yaml.safe_load(f) diff --git a/metrics/MetricClasses.py b/metrics/MetricClasses.py index b9ed3c7..818cf13 100755 --- a/metrics/MetricClasses.py +++ b/metrics/MetricClasses.py @@ -4,6 +4,7 @@ from abc import abstractmethod import time import platform import subprocess +from linecache import cache import requests import psutil @@ -113,8 +114,13 @@ def get_shell_value(command, args, callback=None): def is_ping(ip, count, callback=None): param = '-n' if platform.system().lower() == 'windows' else '-c' command = ['ping', param, str(count), ip] - output = subprocess.check_output(command) - result = 'unreachable' not in str(output) and 'could not find' not in str(output) and 'time out' not in str(output) + try: + 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: callback(result) else: diff --git a/metrics/__pycache__/DataStructures.cpython-312.pyc b/metrics/__pycache__/DataStructures.cpython-312.pyc deleted file mode 100644 index 96440c8..0000000 Binary files a/metrics/__pycache__/DataStructures.cpython-312.pyc and /dev/null differ diff --git a/metrics/__pycache__/MetricClasses.cpython-312.pyc b/metrics/__pycache__/MetricClasses.cpython-312.pyc deleted file mode 100644 index 7269f49..0000000 Binary files a/metrics/__pycache__/MetricClasses.cpython-312.pyc and /dev/null differ diff --git a/metrics/__pycache__/__init__.cpython-312.pyc b/metrics/__pycache__/__init__.cpython-312.pyc deleted file mode 100644 index e866d85..0000000 Binary files a/metrics/__pycache__/__init__.cpython-312.pyc and /dev/null differ