From fdbe4eebe172eabaee38872f4d666118db16f32e Mon Sep 17 00:00:00 2001 From: jaydee Date: Mon, 1 Sep 2025 13:32:58 +0200 Subject: [PATCH] build --- omv_backup.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/omv_backup.py b/omv_backup.py index fa8feef..a6c9ab3 100755 --- a/omv_backup.py +++ b/omv_backup.py @@ -487,9 +487,6 @@ def backup_job(pl): logging.info(f'Debug enabled') LOG_FILE = "omv_backup.log" logging.basicConfig(filename=LOG_FILE, level=logging.DEBUG, format='%(asctime)s : %(levelname)s : %(message)s', datefmt='%m/%d/%Y %I:%M:%S %p') - logging.debug(f'Debug enabled') - logging.debug(f'Debug enabled') - logger.debug(f'Debug 111') logging.info(f'starting backup job') @@ -573,6 +570,7 @@ def backup_job(pl): progress = 0 cmd = ['rsync', '-avz', '--delete', BACKUP_DIR, '--link-dest', FULL_BACKUP_LATEST, '--exclude-from=/myapps/exclude.txt', NEW_BACKUP_DIR] logging.info(" ".join(cmd)) + topic = "sectorq/amd/backups" if not _DRYRUN: process = subprocess.Popen(cmd, stdout=subprocess.PIPE) @@ -589,9 +587,11 @@ def backup_job(pl): break apps.remove(line[0]) #print(len(apps)) - 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)} + logging.info(f"Sending message {json.dumps(msg)}") client2.publish(topic, json.dumps(msg),qos=0, retain=False) + logging.info(f"Sent message {json.dumps(msg)}") progress = progress + step cmnd = f"rm -rf {FULL_BACKUP_LATEST}"