Skip to content
Snippets Groups Projects
Commit cc70724a authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

finetune notifications

parent a45d30d0
No related branches found
No related tags found
1 merge request!101Desktop notification
...@@ -214,7 +214,6 @@ EOFbackupinfo ...@@ -214,7 +214,6 @@ EOFbackupinfo
# "${DIR_SELF}"/transfer.sh $JOBDEF_TYPE "$JOBDEF_AUTO" 2>&1 | tee -a "$JOB_LOGFILE" # "${DIR_SELF}"/transfer.sh $JOBDEF_TYPE "$JOBDEF_AUTO" 2>&1 | tee -a "$JOB_LOGFILE"
"${DIR_SELF}"/transfer.sh $JOBDEF_TYPE "$JOBDEF_AUTO" 2>&1 "${DIR_SELF}"/transfer.sh $JOBDEF_TYPE "$JOBDEF_AUTO" 2>&1
rcTransfer=$? rcTransfer=$?
test $rcTransfer -gt 0 && j_notify "Transfer Dirs" "rc=$rcTransfer" $rcTransfer
else else
echo | tee -a "$JOB_LOGFILE" echo | tee -a "$JOB_LOGFILE"
...@@ -263,7 +262,7 @@ EOFbackupinfo ...@@ -263,7 +262,7 @@ EOFbackupinfo
# -------------------------------------------------------------------------------- # --------------------------------------------------------------------------------
j_notify "Done" "Backup was finished. rc=$rcBackup" $rcBackup j_notify "Done" "Backup was finished. rc=$rcBackup. See log for details: $JOB_LOGFILE" $rcBackup
exit $rcBackup exit $rcBackup
......
...@@ -357,6 +357,7 @@ ...@@ -357,6 +357,7 @@
_j_runHooks "200-before-db-service" _j_runHooks "200-before-db-service"
. $BACKUP_SCRIPT $mode . $BACKUP_SCRIPT $mode
test $rc -gt 0 && j_notify "db ${SERVICENAME}" "$BACKUP_SCRIPT $mode was finished with rc=$rc" $rc
_j_runHooks "230-after-db-service" "$rc" _j_runHooks "230-after-db-service" "$rc"
# ----- post jobs: cleanup # ----- post jobs: cleanup
......
...@@ -406,6 +406,8 @@ function setAction(){ ...@@ -406,6 +406,8 @@ function setAction(){
echo echo
t_rcCheckBackup $myrc "${BACKUP_DIR}" t_rcCheckBackup $myrc "${BACKUP_DIR}"
test $myrc -ne 0 && j_notify "Dir ${BACKUP_DIR}" "Backup for ${BACKUP_DIR} failed with rc=$myrc. See log for details: $JOB_LOGFILE" 1
_j_runHooks "320-after-folder-transfer" "$myrc" _j_runHooks "320-after-folder-transfer" "$myrc"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment