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

Refactoring funzioni di utility

Browse Source
This commit is contained in:
Emanuele Trabattoni
2025-06-01 10:14:46 +02:00
parent 676918e686
commit 021b7e70af
3 changed files with 91 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
routermon/routermon.py
View File

@@ -2,42 +2,22 @@ import os
import sys
import time
import logging
import signal
import json
import routeros_api
from pyutils.utils import *
from influxdb_client_3 import InfluxDBClient3, Point
# Get environment variables
env = dict(os.environ)
LOGGER: logging.Logger
class SignalHandler:
running: bool
def __init__(self):
self.running: bool = True
signal.signal(signal.SIGINT, self._handle_sigint)
signal.signal(signal.SIGTERM, self._handle_sigint)
def _handle_sigint(self, signum, frame):
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 convert_int_list(l: list[dict]) -> list[dict]:
for n,d in enumerate(l):
l[n] = convert_int(d)
return l
##################
###### MAIN ######
##################
def main():
INTERVAL = int(env['INTERVAL'])
# Init InfluxDB
# Init InfluxDB-v3 Client
write_client = InfluxDBClient3(host=env['INFLUXDB_URL'],
token=env['INFLUXDB_TOKEN'],
database=env['INFLUXDB_DATABASE'])
@@ -52,14 +32,14 @@ def main():
########## MAIN LOOP #########
##############################
last: float = 0
handler: SignalHandler = SignalHandler()
if_stats_old = convert_int_list(api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'}))
handler: SignalHandler = SignalHandler(LOGGER)
if_stats_old = convertIntList(api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'}))
while handler.running:
try:
now:float = time.time()
if_points: list[Point] = []
if_stats: list[dict] = convert_int_list(api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'}))
hw_stats: dict[str,str] = convert_int(api.get_resource('/system/resource').call('print', {'proplist':'uptime,cpu-load,total-memory,free-memory'})[0])
if_stats: list[dict] = convertIntList(api.get_resource('/interface/ethernet').call('print', {'proplist': 'name,rx-bytes,tx-bytes'}))
hw_stats: dict[str,str] = convertInt(api.get_resource('/system/resource').call('print', {'proplist':'uptime,cpu-load,total-memory,free-memory'})[0])
# Calcolo della velocita' interfaccia a ogni ciclo
for n, d in enumerate(if_stats):
if_stats[n]['rx-rate'] = int((if_stats[n]['rx-bytes']-if_stats_old[n]['rx-bytes'])/(now-last))
@@ -73,10 +53,7 @@ def main():
write_client.write(record=if_points)
# Risorse del router
hw_point = Point('resources')
for k,v in hw_stats.items():
hw_point.field(k,v)
write_client.write(record=hw_point)
write_client.write(record=dict2Point('resources', hw_stats))
# Salvo ultimo punto per il giro successivo
if_stats_old = if_stats
@@ -118,6 +95,7 @@ if __name__ == "__main__":
LOGGER.addHandler(cl)
LOGGER.warning(f"Routermon started on: {time.asctime()}")
LOGGER.info(f"Routermon BUILD: {env.get("VER", "Test")}")
while main():
LOGGER.error("Main thread exited unexpectedly")