cosmetic changes

backup/pvc/bin/backup.sh

@@ -13,14 +13,14 @@ TRAP_FILE="${BACKUP_DIR}/_backup_${BACKUP_NUMBER}_is_running"
 
 # --> Check if another backup process is running (operator restart/crash)
 for ((i=0; i<RETRY_COUNT; i++)); do
-    [[ ! -f "${TRAP_FILE}" ]] && _log "INFO" "Backup: no other backup process are running" && break
-    _log "INFO" "Backup is already running. Waiting for ${RETRY_INTERVAL} seconds..."
+    [[ ! -f "${TRAP_FILE}" ]] && _log "INFO" "[backup] no other backup process are running" && break
+    _log "INFO" "[backup] backup is already running. Waiting for ${RETRY_INTERVAL} seconds..."
     sleep "${RETRY_INTERVAL}"
 done
-[[ -f "${TRAP_FILE}" ]] && { _log "ERROR" "Backup is still running after waiting ${RETRY_COUNT} time ${RETRY_INTERVAL}s. Exiting."; exit 1; }
+[[ -f "${TRAP_FILE}" ]] && { _log "ERROR" "[backup] backup is still running after waiting ${RETRY_COUNT} time ${RETRY_INTERVAL}s. Exiting."; exit 1; }
 # --< Done
 
-_log "INFO" "Running backup ${BACKUP_NUMBER}"
+_log "INFO" "[backup] running backup ${BACKUP_NUMBER}"
 touch "${TRAP_FILE}"
 # create temp dir on the same filesystem with a BACKUP_DIR to be able use atomic mv enstead of copy
 BACKUP_TMP_DIR=$(mktemp -d --tmpdir="${BACKUP_DIR}")
@@ -32,7 +32,7 @@ _clean(){
 
 _trap(){
     _clean
-    _log "ERROR" "Backup: something wrong happened, check the logs"
+    _log "ERROR" "[backup] something wrong happened, check the logs"
 }
 
 trap '_trap' SIGQUIT SIGINT SIGTERM
@@ -48,16 +48,16 @@ tar --zstd -C "${JENKINS_HOME}" -cf "${BACKUP_TMP_DIR}/${BACKUP_NUMBER}.tar.zstd
     --exclude jobs/*/config.xml -c jobs || ret=$?
 
 if [[ "$ret" -eq 0 ]]; then
-  _log "INFO" "Backup ${BACKUP_NUMBER} was completed without warnings"
+  _log "INFO" "[backup] backup ${BACKUP_NUMBER} was completed without warnings"
 elif [[ "$ret" -eq 1 ]]; then
-  _log "INFO" "Backup ${BACKUP_NUMBER} was completed with some warnings"
+  _log "INFO" "[backup] backup ${BACKUP_NUMBER} was completed with some warnings"
 fi
 
 mv "${BACKUP_TMP_DIR}/${BACKUP_NUMBER}.tar.zstd" "${BACKUP_DIR}/${BACKUP_NUMBER}.tar.zstd"
 
-_log "INFO" "Cleaning ${BACKUP_TMP_DIR} and trap file ${TRAP_FILE}"
+_log "INFO" "[backup] cleaning ${BACKUP_TMP_DIR} and trap file ${TRAP_FILE}"
 _clean
-[[ ! -s ${BACKUP_DIR}/${BACKUP_NUMBER}.tar.zstd ]] && _log "ERROR" "Backup file '${BACKUP_DIR}/${BACKUP_NUMBER}.tar.zstd' is empty" && exit 1
+[[ ! -s ${BACKUP_DIR}/${BACKUP_NUMBER}.tar.zstd ]] && _log "ERROR" "[backup] file '${BACKUP_DIR}/${BACKUP_NUMBER}.tar.zstd' is empty" && exit 1
 
-_log "INFO" "Backup ${BACKUP_NUMBER} done"
+_log "INFO" "[backup] ${BACKUP_NUMBER} done"
 exit 0

backup/pvc/bin/restore.sh

@@ -15,31 +15,31 @@ TRAP_FILE="${BACKUP_DIR}/_restore_${BACKUP_NUMBER}_is_running"
 trap "rm -f ${TRAP_FILE}" SIGINT SIGTERM
 
 for ((i=0; i<RETRY_COUNT; i++)); do
-    [[ ! -f "${TRAP_FILE}" ]] && _log "INFO" "Restore: No other process are running, restoring" && break
-    _log "INFO" "Restore is already running. Waiting for ${RETRY_INTERVAL} seconds..."
+    [[ ! -f "${TRAP_FILE}" ]] && _log "INFO" "[restore] no other process are running, restoring" && break
+    _log "INFO" "[restore] is already running. Waiting for ${RETRY_INTERVAL} seconds..."
     sleep "${RETRY_INTERVAL}"
 done
-[[ -f "${TRAP_FILE}" ]] && { _log "ERROR" "Restore is still running after waiting ${RETRY_COUNT} time ${RETRY_INTERVAL}s. Exiting."; exit 1; }
+[[ -f "${TRAP_FILE}" ]] && { _log "ERROR" "[restore] is still running after waiting ${RETRY_COUNT} time ${RETRY_INTERVAL}s. Exiting."; exit 1; }
 # --< Done
 
-_log "INFO" "Running restore backup with backup number #${BACKUP_NUMBER}"
+_log "INFO" "[restore] restore backup with backup number #${BACKUP_NUMBER}"
 touch "${TRAP_FILE}"
 BACKUP_FILE="${BACKUP_DIR}/${BACKUP_NUMBER}"
 
 if [[ -f "$BACKUP_FILE.tar.gz" ]]; then
-    _log "INFO" "Restore: ld format tar.gz found, restoring it"
+    _log "INFO" "[restore] old format tar.gz found, restoring it"
     OPTS=""
     EXT="tar.gz"
 elif [[ -f "$BACKUP_FILE.tar.zstd" ]]; then
-    _log "INFO" "Restore: Backup file found, proceeding"
+    _log "INFO" "[restore] Backup file found, proceeding"
     OPTS="--zstd"
     EXT="tar.zstd"
 else
-  _log "ERROR" "Restore: Backup file not found: $BACKUP_FILE"
+  _log "ERROR" "[restore] backup file not found: $BACKUP_FILE"
   exit 1
 fi
 
 tar $OPTS -C "${JENKINS_HOME}" -xf "${BACKUP_DIR}/${BACKUP_NUMBER}.${EXT}"
 
-_log "INFO" "Restore: ${BACKUP_NUMBER} Done"
+_log "INFO" "[restore] restoring ${BACKUP_NUMBER} Done"
 exit 0

backup/pvc/bin/run.sh

@@ -42,7 +42,7 @@ find_exceeding_backups() {
     local backup_count="$2"
     # Check if we have any backup
     if is_backup_not_exist "${backup_dir}"; then
-        _log "ERROR" "backups not found in ${backup_dir}"
+        _log "ERROR" "[run] backups not found in ${backup_dir}"
         return
     fi
     find "${backup_dir}"/*.tar.zstd -maxdepth 0 -exec basename {} \; | sort -gr | tail -n +$((backup_count +1))
@@ -52,9 +52,9 @@ check_env_var "BACKUP_DIR"
 check_env_var "JENKINS_HOME"
 
 if [[ -z "${BACKUP_COUNT}" ]]; then
-    _log "WARNING" "No BACKUP_COUNT set, it means you MUST delete old backups manually or by custom script"
+    _log "WARNING" "[run] no BACKUP_COUNT set, it means you MUST delete old backups manually or by custom script"
 else
-    _log "INFO" "Retaining only the ${BACKUP_COUNT} most recent backups, cleanup occurs every ${BACKUP_CLEANUP_INTERVAL} seconds"
+    _log "INFO" "[run] retaining only the ${BACKUP_COUNT} most recent backups, cleanup occurs every ${BACKUP_CLEANUP_INTERVAL} seconds"
 fi
 
 while true;
@@ -63,7 +63,7 @@ do
     if [[ -n "${BACKUP_COUNT}" ]]; then
         exceeding_backups=$(find_exceeding_backups "${BACKUP_DIR}" "${BACKUP_COUNT}")
         if [[ -n "$exceeding_backups" ]]; then
-            _log "INFO" "Removing backups: $(echo "$exceeding_backups" | tr '\n' ', ' | sed 's/,$//')"
+            _log "INFO" "[run] removing backups: $(echo "$exceeding_backups" | tr '\n' ', ' | sed 's/,$//')"
             echo "$exceeding_backups" | while read -r file; do
                 rm "${BACKUP_DIR}/${file}"
             done