.gitignore

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

config_file.py

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

metrics/MetricClasses.py

@@ -4,7 +4,6 @@ from abc import abstractmethod
 import time
 import platform
 import subprocess
-from linecache import cache
 
 import requests
 import psutil
@@ -114,13 +113,8 @@ 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]
-    try:
+    output = subprocess.check_output(command)
-        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)
-        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: