Merge pull request 'Dev to Main: corrections' (#2) from dev into main

Reviewed-on: #2
Removed unnecessary folder
Corrected ICMP function
Tested YAML files processing
Updated .gitignore file
This commit is contained in:
Anry Das 2025-02-18 10:25:39 +02:00
commit 78b7ea7146
6 changed files with 12 additions and 7 deletions

7
.gitignore vendored
View File

@ -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__/

View File

@ -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)

View File

@ -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]
try:
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: