This commit is contained in:
2025-08-26 15:15:26 +02:00
parent 64bea0a833
commit 984b3e09a0

View File

@@ -201,12 +201,12 @@ logging.info("Test connection")
hm = socket.gethostbyaddr(BACKUP_HOST) hm = socket.gethostbyaddr(BACKUP_HOST)
logging.info(_RESTORE) logging.info(_RESTORE)
def send_mqtt_message(topic,msg): def send_mqtt_message(topic,msg,qos=0,retain=False):
client2 = mqtt.Client() client2 = mqtt.Client()
client2.username_pw_set(USERNAME, PASSWORD) client2.username_pw_set(USERNAME, PASSWORD)
try: try:
client2.connect(broker,1883,60) client2.connect(broker,1883,60)
client2.publish(topic, json.dumps(msg)) client2.publish(topic, json.dumps(msg), qos=qos, retain=retain)
client2.disconnect() client2.disconnect()
logging.info(f"Message sent {topic}, {msg}") logging.info(f"Message sent {topic}, {msg}")
except ValueError as e: except ValueError as e:
@@ -569,7 +569,7 @@ def backup_job(server):
#print(len(apps)) #print(len(apps))
topic = "sectorq/amd/backups" topic = "sectorq/amd/backups"
msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"sub":line[0],"start_time":STARTTIME,"end_time":"in progress","progress":str(round(progress)) + "%","finished":",".join(finished)} msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":host,"cur_job":b,"sub":line[0],"start_time":STARTTIME,"end_time":"in progress","progress":str(round(progress)) + "%","finished":",".join(finished)}
send_mqtt_message(topic,msg) # send_mqtt_message(topic,msg)
progress = progress + step progress = progress + step
cmnd = f"rm -rf {FULL_BACKUP_LATEST}" cmnd = f"rm -rf {FULL_BACKUP_LATEST}"
@@ -646,7 +646,8 @@ def backup_job(server):
logging.info(msg) logging.info(msg)
send_mqtt_message(topic,msg) send_mqtt_message(topic,msg)
topic = "sectorq/backups/start"
send_mqtt_message(topic, "finished",qos=2,retain=True)
topic = "sectorq/amd/restore" topic = "sectorq/amd/restore"
for s in servers: for s in servers:
@@ -744,10 +745,9 @@ def handle_payload(payload):
payload = payload.lower() payload = payload.lower()
if payload == 'm-server': if payload == 'm-server':
logging.info("💡 Starting backup job") logging.info("💡 Starting backup job")
res = backup_job(payload) backup_job(payload)
logging.info(f"💡 Finished backup job /{res}") logging.info(f"💡 Finished backup job")
topic = "sectorq/backups/start"
client.publish(topic, res,qos=2,retain=True)
else: else:
logging.error(f"⚠️ Unknown command: {payload}") logging.error(f"⚠️ Unknown command: {payload}")