From 59e7f0dcd3fe33a12db286ea37a74a86a0b9fd16 Mon Sep 17 00:00:00 2001 From: jaydee Date: Fri, 19 Dec 2025 16:29:47 +0100 Subject: [PATCH] build --- mqtt_srv.py | 91 +++++++++++++---------------------------------------- 1 file changed, 22 insertions(+), 69 deletions(-) diff --git a/mqtt_srv.py b/mqtt_srv.py index 6fa4693..8fad507 100755 --- a/mqtt_srv.py +++ b/mqtt_srv.py @@ -849,7 +849,7 @@ def on_message(client, userdata, msg): subprocess.Popen(['MultiMonitorTool.exe', '/LoadConfig', 'c:\\Program Files\\jaydee\\switcher.cfg']) client.publish("sectorq/feedback", payload='{"action":"resp", "source":"ASUS", "dev":{"display' + str(myObj["target"]) + '":'+ str(myObj["status"]) +'} }' , qos=0, retain=False) if myObj["cmd"] == "displ": - print("Display") + writeLog("Display") # os.startfile(sys.argv[0]) #sys.exit() subprocess.Popen(['/usr/bin/xrandr', '--output', 'HDMI-1-1', '--off']) @@ -858,7 +858,7 @@ def on_message(client, userdata, msg): if curos == "Windows": subprocess.Popen(['MultiMonitorTool.exe', '/LoadConfig', 'c:\\Program Files\\jaydee\\all_on.cfg']) else: - print("Display") + writeLog("Display") # os.startfile(sys.argv[0]) #sys.exit() os.system("export DISPLAY=:0") @@ -894,8 +894,8 @@ def on_message(client, userdata, msg): writeLog(cmnd) #subprocess.Popen(cmnd) status, output = subprocess.getstatusoutput(cmnd) - print(output) - print(status) + writeLog(output) + writeLog(str(status)) if myObj["cmd"] == "stats": grep = subprocess.Popen(['grep', 'cpu', '/proc/stat'], @@ -942,8 +942,8 @@ def on_message(client, userdata, msg): jn = json.dumps(jn) client.publish("sectorq/status/" + host, payload=jn, qos=0, retain=False) except: - print("not a json!") - print(msg.payload) + writeLog("not a json!") + writeLog(str(msg.payload)) client = mqtt.Client() payload = '{"status": "off"}' @@ -1034,27 +1034,13 @@ if curos == "Windows": else: - print("CPU Cnt : {}".format(psutil.cpu_count())) - print(psutil.virtual_memory()) + cpu_usage = psutil.cpu_percent(interval=None) swap_data = psutil.swap_memory() - print("CPU : {}".format(cpu_usage)) mem_data = psutil.virtual_memory() - print(mem_data) - print(swap_data) - print("MEM : {}".format(mem_data.percent)) - print(psutil.getloadavg()) - #lodctr /R - try: - print(psutil.sensors_temperatures()) - except: - pass - try: - print(psutil.sensors_fans()) - except: - pass + + results = {"status":"on","version":VERSION,"MB_TEMP":"NA", "MEM_UTIL":str(mem_data.percent), "CPU_TEMP":"NA", "FAN_CPU":"NA", "VMEM_UTIL":swap_data.percent, "CPU_UTIL":cpu_usage, "GPU_TEMP":"NA", "GPU_UTIL":"NA"} - print(json.dumps(results)) r = json.dumps(results) #client.publish("home-assistant/" + host + "/hwstats", payload='{"TPCHDIO":"' + str(results["TPCHDIO"]) + '", "SMEMUTI":"' + str(results["SMEMUTI"]) + '", "TCPU":"' + str(results["TCPU"]) + '", "TGPU1DIO":"' + str(results["TGPU1DIO"]) + '", "SGPU1BIUTI":"' + str(results["SGPU1BIUTI"]) + '", "FCPU":"' + str(results["FCPU"]) + '", "SVIRTMEMUTI":"' + str(results["SVIRTMEMUTI"]) + '", "SCPUUTI":"' + str(results["SCPUUTI"]) + '"}', qos=0, retain=False) client.publish("home-assistant/" + host + "/hwstats", payload=r, qos=0, retain=False) @@ -1076,9 +1062,6 @@ if curos == "Windows": if host.lower() == "router" or host.lower() == "omv": #sys.stdout.flush() #os.execv(sys.argv, "") - print("argv was",sys.argv) - print("sys.executable was", sys.executable) - print("restart now") os.execv(sys.executable, ['python3'] + sys.argv) #os.startfile(sys.argv[0]) @@ -1101,12 +1084,8 @@ else: #writeLog("Blalala : Next : " + str(NEXT_CHECK)) if host.lower() == "rpi5": #writeLog("Blalala : AAA") - print(psutil.sensors_temperatures()) #print(psutil.sensors_fans()) sences = psutil.sensors_temperatures() - print("SENCES") - print(sences) - print("#"*40) try: cpu_data = sences["cpu_thermal"][0] except: @@ -1115,22 +1094,16 @@ else: except: cpu_data = "None" writeLog(cpu_data) - print("CPUDATA") - print(cpu_data) - print("#"*40) - print("MBDATA") + try: mb_data = sences["acpitz"][0] - print(mb_data) - print(mb_data.current) + writeLog(mb_data) + writeLog(mb_data.current) mb_data = mb_data.current except: mb_data = 0 - - print("#"*40) - - + try: print(psutil.sensors_fans()) fan_data = psutil.sensors_fans()["pwmfan"][0].current @@ -1141,10 +1114,7 @@ else: #cpu_usage = psutil.cpu_percent(interval=1) load1, load5, load15 = psutil.getloadavg() cpu_usage = round((load1/os.cpu_count()) * 100, 1) - - print(mem_data) - print(mem_data.percent) - print(psutil.disk_usage('/')) + #print(psutil.virtual_memory()) #print(dict(psutil.virtual_memory()._asdict())) #cmnd = "sensors -j|grep -v \"Can't read\"" @@ -1161,12 +1131,8 @@ else: client.publish("sectorq/systems/" + host.lower() + "/stat", payload="on", qos=0, retain=True) if host.lower() == "asus" or host.lower() == "m-server" or host.lower() == "morefine" or host.lower() == "ryzen" or host.lower() == "amd" or host.lower() == "rack": #writeLog("Blalala : AAA") - print(psutil.sensors_temperatures()) #print(psutil.sensors_fans()) sences = psutil.sensors_temperatures() - print("SENCES") - print(sences) - print("#"*40) try: cpu_data = sences["coretemp"][0] except: @@ -1175,24 +1141,18 @@ else: except: cpu_data = "None" writeLog(cpu_data) - print("CPUDATA") - print(cpu_data) - print("#"*40) - print("MBDATA") try: mb_data = sences["acpitz"][0] - print(mb_data) - print(mb_data.current) + writeLog(mb_data) + writeLog(mb_data.current) mb_data = mb_data.current except: mb_data = 0 - - - print("#"*40) + try: - print(psutil.sensors_fans()) + writeLog(psutil.sensors_fans()) fan_data = psutil.sensors_fans()["asus"][0].current except: fan_data = "None" @@ -1202,9 +1162,6 @@ else: load1, load5, load15 = psutil.getloadavg() cpu_usage = round((load1/os.cpu_count()) * 100, 1) - print(mem_data) - print(mem_data.percent) - print(psutil.disk_usage('/')) #print(psutil.virtual_memory()) #print(dict(psutil.virtual_memory()._asdict())) #cmnd = "sensors -j|grep -v \"Can't read\"" @@ -1231,10 +1188,6 @@ else: #cpu_usage = psutil.cpu_percent(interval=1) load1, load5, load15 = psutil.getloadavg() cpu_usage = round((load1/os.cpu_count()) * 100, 1) - print(psutil.getloadavg()) - print("CPU Util : {}".format(cpu_usage)) - print(mem_data) - print(mem_data.percent) raid_data = psutil.disk_usage('/srv/dev-disk-by-uuid-2f843500-95b6-43b0-bea1-9b67032989b8') #print(psutil.virtual_memory()) #print(dict(psutil.virtual_memory()._asdict())) @@ -1250,7 +1203,7 @@ else: stat_rsync = "off" #sdiskusage = psutil.disk_partitions() disk_usage = raid_data[3] - print(disk_usage) + writeLog("Disk usage: " + str(disk_usage)) sys_uptime = str(datetime.timedelta(seconds=round(time.time() - psutil.boot_time(), 0))) reboot_pending = False if os.path.exists("/var/run/reboot-required"): @@ -1308,9 +1261,9 @@ else: if host.lower() == "router" or host.lower() == "omv": #sys.stdout.flush() #os.execv(sys.argv, "") - print("argv was",sys.argv) - print("sys.executable was", sys.executable) - print("restart now") + writeLog("argv was " + str(sys.argv)) + writeLog("sys.executable was " + str(sys.executable)) + writeLog("restart now") os.execv(sys.executable, ['python3'] + sys.argv) #os.startfile(sys.argv[0])