Obbart/edelweiss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix codice duplicato e errato reset vettore punti

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-05-31 18:46:13 +02:00
parent 08020ef3ce
commit b346279b04
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
routermon/routermon.py
View File

@@ -23,6 +23,12 @@ class SignalHandler:
def _handle_sigint(self, signum, frame): def _handle_sigint(self, signum, frame):
self.running = False self.running = False
def convert_int(d: dict) -> dict:
for k,v in d.items():
if str.isdecimal(v):
d[k] = int(v)
return d
def main(): def main():
INTERVAL = int(env['INTERVAL']) INTERVAL = int(env['INTERVAL'])
@@ -39,23 +45,18 @@ def main():
run: SignalHandler = SignalHandler() run: SignalHandler = SignalHandler()
last = 0 last = 0
if_points = [] if_stats_old = convert_int(api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'}))
if_stats_old = api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'})
for n,d in enumerate(if_stats_old):
for k,v in d.items():
if str.isdecimal(v):
if_stats_old[n][k] = int(v)
### MAIN LOOP ### ### MAIN LOOP ###
while run: while run:
try: try:
now = time.time() now = time.time()
if_points: list[Point] = []
if_stats: list[dict] = api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'}) if_stats: list[dict] = api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'})
hw_stats: dict[str,str] = api.get_resource('/system/resource').call('print', {'proplist':'uptime,cpu-load,total-memory,free-memory'})[0] hw_stats: dict[str,str] = convert_int(api.get_resource('/system/resource').call('print', {'proplist':'uptime,cpu-load,total-memory,free-memory'})[0])
# calcolo della velocita' interfaccia a ogni ciclo # calcolo della velocita' interfaccia a ogni ciclo
for n,d in enumerate(if_stats): for n,d in enumerate(if_stats):
for k,v in d.items(): if_stats[n] = convert_int(d)
if str.isdecimal(v):
if_stats[n][k] = int(v)
if_stats[n]['rx-rate'] = int((if_stats[n]['rx-bytes']-if_stats_old[n]['rx-bytes'])/(now-last)) if_stats[n]['rx-rate'] = int((if_stats[n]['rx-bytes']-if_stats_old[n]['rx-bytes'])/(now-last))
if_stats[n]['tx-rate'] = int((if_stats[n]['tx-bytes']-if_stats_old[n]['tx-bytes'])/(now-last)) if_stats[n]['tx-rate'] = int((if_stats[n]['tx-bytes']-if_stats_old[n]['tx-bytes'])/(now-last))
if_points.append( if_points.append(
@@ -68,7 +69,7 @@ def main():
hw_point = Point('resources') hw_point = Point('resources')
for k,v in hw_stats.items(): for k,v in hw_stats.items():
hw_point.field(k,int(v) if v.isdecimal() else v) hw_point.field(k,v)
write_client.write(record=hw_point) write_client.write(record=hw_point)
if_stats_old = if_stats if_stats_old = if_stats