minor update

This commit is contained in:
vvzvlad 2023-05-30 21:42:05 +07:00
parent fdf4422302
commit 6232518d7d

View File

@ -5,8 +5,8 @@ import os
import json import json
import argparse import argparse
def restart_service(history=False): def restart_service(skip_restart=False, history=False):
if history == False: if not skip_restart and not history:
subprocess.Popen(["systemctl", "restart", "wb-mqtt-serial"], stdout=subprocess.PIPE) subprocess.Popen(["systemctl", "restart", "wb-mqtt-serial"], stdout=subprocess.PIPE)
def parse_config_file(filename): def parse_config_file(filename):
@ -18,16 +18,21 @@ def parse_config_file(filename):
for port in config_data["ports"]: for port in config_data["ports"]:
for device in port["devices"]: for device in port["devices"]:
device_to_port[device["slave_id"]] = port["path"] device_to_port[device["slave_id"]] = port["path"]
device_stats[device["slave_id"]] = {"type": device.get("device_type", "Unknown type"), "errors": 0, "disconnects": 0, "write_failures": 0} # Initialize counts as zero device_stats[device["slave_id"]] = {"type": device.get("device_type", "Unknown type"), "errors": 0, "disconnects": 0, "write_failures": 0}
return device_to_port, device_stats return device_to_port, device_stats
def parse_journal(device_to_port, device_stats, history=False): def parse_journal(device_to_port, device_stats, skip_lines=10, history=False):
cmd = ["journalctl", "-f", "-u", "wb-mqtt-serial"] if not history else ["journalctl", "-u", "wb-mqtt-serial"] cmd = ["journalctl", "-f", "-u", "wb-mqtt-serial"] if not history else ["journalctl", "-u", "wb-mqtt-serial"]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE) p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
last_log_line = None last_log_line = None
line_counter = 0
for line in iter(p.stdout.readline, b''): for line in iter(p.stdout.readline, b''):
line_counter += 1
if line_counter <= skip_lines:
continue
line = line.decode('utf-8') # convert bytes to string line = line.decode('utf-8') # convert bytes to string
match_error = re.search(r'modbus:(\d+): Serial protocol error: request timed out', line) match_error = re.search(r'modbus:(\d+): Serial protocol error: request timed out', line)
match_disconnect = re.search(r'INFO: \[serial device\] device modbus:(\d+) is disconnected', line) match_disconnect = re.search(r'INFO: \[serial device\] device modbus:(\d+) is disconnected', line)
@ -44,35 +49,57 @@ def parse_journal(device_to_port, device_stats, history=False):
last_log_line = line last_log_line = line
# clear the console
os.system('clear') os.system('clear')
# print the last log line
print(f"Last log line: {last_log_line}") print(f"Last log line: {last_log_line}")
# print error statistics
print_error_statistics(device_stats, device_to_port) print_error_statistics(device_stats, device_to_port)
def print_table(headers, data):
col_widths = [
max(len(str(x)) for x in col)
for col in zip(*data, headers)
]
row_format = "| " + " | ".join("{:<" + str(width) + "}" for width in col_widths) + " |"
print("+-" + "-+-".join("-" * width for width in col_widths) + "-+")
print(row_format.format(*headers))
print("+-" + "-+-".join("-" * width for width in col_widths) + "-+")
for row in data:
print(row_format.format(*row))
print("+-" + "-+-".join("-" * width for width in col_widths) + "-+")
def print_error_statistics(device_stats, device_to_port): def print_error_statistics(device_stats, device_to_port):
print("\n--- Device Statistics ---") print("\n--- Device Statistics ---")
# sort by total count
sorted_device_stats = sorted(device_stats.items(), key=lambda x: (x[1]["errors"], x[1]["disconnects"], x[1]["write_failures"]), reverse=True) sorted_device_stats = sorted(device_stats.items(), key=lambda x: (x[1]["errors"], x[1]["disconnects"], x[1]["write_failures"]), reverse=True)
max_type_length = max(len(stats['type']) for stats in device_stats.values()) headers = ["Type", "Port", "ID", "Timeouts", "Disconnects", "Write Failures"]
data = []
for device, stats in sorted_device_stats: for device, stats in sorted_device_stats:
device_port = device_to_port.get(device, "Unknown port") device_port = device_to_port.get(device, "Unknown port").replace("/dev/tty", "")
type_field = stats['type'].ljust(max_type_length) type_field = stats['type']
print(f"{type_field}\t {device}\t on port: {device_port},\t timeouts: {stats['errors']},\t disconnects: {stats['disconnects']},\t write failures: {stats['write_failures']}") error_field = str(stats['errors'])
disconnect_field = str(stats['disconnects'])
write_failure_field = str(stats['write_failures'])
data.append([type_field, device_port, device, error_field, disconnect_field, write_failure_field])
print_table(headers, data)
def parse_args(): def parse_args():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("-H", "--history", help="parse historical data from journal", action="store_true") parser.add_argument("-H", "--history", help="parse historical data from journal", action="store_true")
parser.add_argument("-S", "--skip-service-restart", help="skip service restart", action="store_true")
args = parser.parse_args() args = parser.parse_args()
return args return args
if __name__ == "__main__": if __name__ == "__main__":
args = parse_args() args = parse_args()
restart_service(history=args.history) restart_service(skip_restart=args.skip_service_restart, history=args.history)
device_to_port, device_stats = parse_config_file("/mnt/data/etc/wb-mqtt-serial.conf") device_to_port, device_stats = parse_config_file("/mnt/data/etc/wb-mqtt-serial.conf")
parse_journal(device_to_port, device_stats, history=args.history) parse_journal(device_to_port, device_stats, history=args.history)