jaydee/omv_backup
1
0
Fork 0
mirror of https://gitlab.sectorq.eu/jaydee/omv_backup.git synced 2025-07-01 23:58:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

lala

Browse Source
This commit is contained in:
jaydee
2025-01-10 23:08:06 +01:00
parent ab402eb1ae
commit a0315aa7b3
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
omv_backup_v2.py
View File

@ -76,7 +76,7 @@ client.username_pw_set(mqtt_username, mqtt_password)
client.connect(broker,1883,60) client.connect(broker,1883,60)
now = datetime.datetime.now() now = datetime.datetime.now()
STARTTIME = now.strftime("%Y-%m-%d_%H:%M:%S") STARTTIME = now.strftime("%Y-%m-%d_%H:%M:%S")
msg = {"mode":_MODE, "status":"started","bak_name":"complete","start_time":STARTTIME,"end_time":"in progress","progress":0} msg = {"mode":_MODE, "status":"started","bak_name":"complete","host":"","cur_job":"","start_time":STARTTIME,"end_time":"in progress","progress":0}
client.publish(topic_sum, json.dumps(msg)); client.publish(topic_sum, json.dumps(msg));
client.disconnect() client.disconnect()
@ -312,6 +312,7 @@ if _BACKUP:
else: else:
# iterate over files in # iterate over files in
# that directory # that directory
finished = []
for filename in os.scandir(directory): for filename in os.scandir(directory):
if filename.is_file(): if filename.is_file():
print(filename.path) print(filename.path)
@ -345,7 +346,8 @@ if _BACKUP:
FULL_BACKUP_LATEST = f"{BACKUP_ROOT}/latest" FULL_BACKUP_LATEST = f"{BACKUP_ROOT}/latest"
msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0} # msg = {"status":"started","bak_name":b,"start_time":DATETIME,"end_time":"in progress", "progress":0}
msg = {"mode":_MODE, "status":"started","bak_name":b,"host":host,"cur_job":b,"start_time":STARTTIME,"end_time":"in progress","progress":0}
client.connect(broker,1883,60) client.connect(broker,1883,60)
client.publish(topic, json.dumps(msg)) client.publish(topic, json.dumps(msg))
client.disconnect() client.disconnect()
@ -409,7 +411,9 @@ if _BACKUP:
status, output = subprocess.getstatusoutput(cmnd) status, output = subprocess.getstatusoutput(cmnd)
now = datetime.datetime.now() now = datetime.datetime.now()
ENDTIME = now.strftime("%Y-%m-%d_%H:%M:%S") ENDTIME = now.strftime("%Y-%m-%d_%H:%M:%S")
msg = {"status":"finished","bak_name":b,"start_time":DATETIME,"end_time":ENDTIME,"progress":0} #msg = {"status":"finished","bak_name":b,"start_time":DATETIME,"end_time":ENDTIME,"progress":0}
finished.append(b)
msg = {"mode":_MODE, "status":"finished","bak_name":b,"host":host,"cur_job":b,"start_time":ENDTIME,"end_time":"in progress","progress":0,"finished":",".join(finished)}
client.connect(broker,1883,10) client.connect(broker,1883,10)
client.publish(topic, json.dumps(msg)) client.publish(topic, json.dumps(msg))
client.disconnect() client.disconnect()
@ -423,7 +427,8 @@ if _BACKUP:
ENDJOB = now.strftime("%Y-%m-%d_%H:%M:%S") ENDJOB = now.strftime("%Y-%m-%d_%H:%M:%S")
print("Size : {}".format(used_space)) print("Size : {}".format(used_space))
print("Sending finished status") print("Sending finished status")
msg = {"mode":_MODE,"status":"finished","bak_name":"complete","start_time":STARTTIME,"end_time":ENDJOB,"progress":0,"used_space":used_space} #msg = {"mode":_MODE,"status":"finished","bak_name":"complete","start_time":STARTTIME,"end_time":ENDJOB,"progress":0,"used_space":used_space}
msg = {"mode":_MODE, "status":"finished","bak_name":"complete","host":host,"cur_job":b,"start_time":STARTTIME,"end_time":ENDTIME,"progress":0,"finished":",".join(finished)}
print(msg) print(msg)