This commit is contained in:
2025-09-01 13:32:58 +02:00
parent 3a3faad97e
commit fdbe4eebe1

View File

@@ -487,9 +487,6 @@ def backup_job(pl):
logging.info(f'Debug enabled') logging.info(f'Debug enabled')
LOG_FILE = "omv_backup.log" 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.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') logging.info(f'starting backup job')
@@ -573,6 +570,7 @@ def backup_job(pl):
progress = 0 progress = 0
cmd = ['rsync', '-avz', '--delete', BACKUP_DIR, '--link-dest', FULL_BACKUP_LATEST, '--exclude-from=/myapps/exclude.txt', NEW_BACKUP_DIR] cmd = ['rsync', '-avz', '--delete', BACKUP_DIR, '--link-dest', FULL_BACKUP_LATEST, '--exclude-from=/myapps/exclude.txt', NEW_BACKUP_DIR]
logging.info(" ".join(cmd)) logging.info(" ".join(cmd))
topic = "sectorq/amd/backups"
if not _DRYRUN: if not _DRYRUN:
process = subprocess.Popen(cmd, process = subprocess.Popen(cmd,
stdout=subprocess.PIPE) stdout=subprocess.PIPE)
@@ -589,9 +587,11 @@ def backup_job(pl):
break break
apps.remove(line[0]) apps.remove(line[0])
#print(len(apps)) #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)} 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) client2.publish(topic, json.dumps(msg),qos=0, retain=False)
logging.info(f"Sent message {json.dumps(msg)}")
progress = progress + step progress = progress + step
cmnd = f"rm -rf {FULL_BACKUP_LATEST}" cmnd = f"rm -rf {FULL_BACKUP_LATEST}"