backup/borg2-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

borg2-backup-nc.sh,borg2-backup.sh: some minor changes on message handling.

Browse Source
This commit is contained in:
Christoph 2024-12-17 00:47:08 +01:00
parent c7c028abfc
commit 2e66132717
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
borg2-backup-nc.sh
View File

@ -783,19 +783,17 @@ if [ $error -gt 0 -o $warning -gt 0 ] ; then
echo -e -n " Send Error Message to ${ADMIN_EMAIL}.." echo -e -n " Send Error Message to ${ADMIN_EMAIL}.."
fi fi
host_name="$(hostname -f)"
err_msg="$(grep -A 2 -i -e"\[\s*ERROR" ${BORG_LOG_FILE})\n" err_msg="$(grep -A 2 -i -e"\[\s*ERROR" ${BORG_LOG_FILE})\n"
warn_msg="$(grep -A 2 -i -e"\[\s*WARN" ${BORG_LOG_FILE})\n" warn_msg="$(grep -A 2 -i -e"\[\s*WARN" ${BORG_LOG_FILE})\n"
msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '${host_name}' beendet mit:" msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '$(hostname -f)' beendet mit:"
msg_body_01="\t${error} Error(s)\n\t${warning} Warning(s)\n" msg_body_01="\t${error} Error(s)\n\t${warning} Warning(s)\n"
msg_body_02="\n\n--- ERROR(S) ---\n${err_msg}\n\n--- WARNING(S) ...\n${warn_msg}" msg_body_02="\n\n--- ERROR(S) ---\n${err_msg}\n\n--- WARNING(S) ...\n${warn_msg}"
msg="${msg_top}\n${msg_body_01}\n${msg_body_02}" msg="${msg_top}\n${msg_body_01}\n${msg_body_02}"
subject="Borg Backup Errors at ${host_name} -- ${datum}" subject="Borg Backup Errors at ${host_name} -- ${datum}"
#subject="Borg Backup Errors at ${host_name}"
subject_utf8="$(echo "${subject}" | iconv -t UTF8)" subject_utf8="$(echo "${subject}" | iconv -t UTF8)"
subject_utf8_encoded="=?utf-8?B?$(echo ${subject_utf8} | base64 --wrap=0)?=" subject_utf8_encoded="=?utf-8?B?$(echo ${subject_utf8} | base64 --wrap=0)?="

6
borg2-backup.sh
View File

@ -752,21 +752,17 @@ if [ $error -gt 0 -o $warning -gt 0 ] ; then
echo -e -n " Send Error Message to ${ADMIN_EMAIL}.." echo -e -n " Send Error Message to ${ADMIN_EMAIL}.."
fi fi
#ADMIN_EMAIL="ckubu@oopen.de"
host_name="$(hostname -f)"
err_msg="$(grep -A 2 -i -e"\[\s*ERROR" ${BORG_LOG_FILE})\n" err_msg="$(grep -A 2 -i -e"\[\s*ERROR" ${BORG_LOG_FILE})\n"
warn_msg="$(grep -A 2 -i -e"\[\s*WARN" ${BORG_LOG_FILE})\n" warn_msg="$(grep -A 2 -i -e"\[\s*WARN" ${BORG_LOG_FILE})\n"
msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '${host_name}' beendet mit:" msg_top="Borg Backup Error ${COMPANY} vom ${datum}.\nBorg Backup on '$(hostname -f)' beendet mit:"
msg_body_01="\t${error} Error(s)\n\t${warning} Warning(s)\n" msg_body_01="\t${error} Error(s)\n\t${warning} Warning(s)\n"
msg_body_02="\n\n--- ERROR(S) ---\n${err_msg}\n\n--- WARNING(S) ...\n${warn_msg}" msg_body_02="\n\n--- ERROR(S) ---\n${err_msg}\n\n--- WARNING(S) ...\n${warn_msg}"
msg="${msg_top}\n${msg_body_01}\n${msg_body_02}" msg="${msg_top}\n${msg_body_01}\n${msg_body_02}"
subject="Borg Backup Errors at ${host_name} -- ${datum}" subject="Borg Backup Errors at ${host_name} -- ${datum}"
#subject="Borg Backup Errors at ${host_name}"
subject_utf8="$(echo "${subject}" | iconv -t UTF8)" subject_utf8="$(echo "${subject}" | iconv -t UTF8)"
subject_utf8_encoded="=?utf-8?B?$(echo ${subject_utf8} | base64 --wrap=0)?=" subject_utf8_encoded="=?utf-8?B?$(echo ${subject_utf8} | base64 --wrap=0)?="