From 2d03ea9e11a6b9860550ac837214bb68e9297c46 Mon Sep 17 00:00:00 2001 From: Bryan Date: Mon, 2 Nov 2020 23:51:31 -0600 Subject: [PATCH] add logging to log file --- install | 1 + src/borgwrapper | 39 ++++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/install b/install index 39132a7..2acc655 100755 --- a/install +++ b/install @@ -44,6 +44,7 @@ cat < /etc/logrotate/logrotate.d/borgwrapper diff --git a/src/borgwrapper b/src/borgwrapper index b319a75..8e921b7 100755 --- a/src/borgwrapper +++ b/src/borgwrapper @@ -2,13 +2,20 @@ VERSION="2.0" SCRIPT_NAME=$(basename $0) +LOGFILE="/var/log/borgwrapper/borgwrapper.log" + +# Create log directory if not exist +if [ ! -d $(dirname ${LOGFILE}) ]; then + mkdir $(dirname ${LOGFILE} +fi + log () { - echo "$@" | logger -p user.notice -t ${SCRIPT_NAME} + echo "$@" >> ${LOGFILE} } err () { - echo "$@" | logger -p user.err -t ${SCRIPT_NAME} + echo "$@" >> ${LOGFILE} } print_usage () { @@ -86,7 +93,7 @@ borg_init () { ) fi log "Initializing ${BORG_REPO}" - ${BORG} init "${BORG_INIT_ARGS[@]}" "${BORG_REPO}" + ${BORG} init "${BORG_INIT_ARGS[@]}" "${BORG_REPO}" > ${LOGFILE} } borg_backup () { @@ -118,6 +125,7 @@ borg_backup () { "${BORG_REPO}"::"${SYSTEM_NAME}-$(date -u +'%Y-%m-%dT%H-%M-%SZ')" \ "${PATHS[@]}" \ "${EXCLUDE_CMD[@]}" \ + >> ${LOGFILE} \ || log "Error backing up. Has repo been initialized?" } @@ -143,7 +151,8 @@ borg_prune () { --keep-weekly=${KEEP_WEEKLY:-0} \ --keep-monthly=${KEEP_MONTHLY:-0} \ --keep-yearly=${KEEP_YEARLY:-0} \ - "${BORG_REPO}" + "${BORG_REPO}" \ + >> "${LOGFILE} } borg_verify () { @@ -154,12 +163,12 @@ borg_verify () { fi log "Running borg check" - ${BORG} check "${BORG_CHECK_ARGS[@]}" "${BORG_REPO}" + ${BORG} check "${BORG_CHECK_ARGS[@]}" "${BORG_REPO}" >> ${LOGFILE} } borg_exec () { export BORG_REPO - ${BORG} "$@" + ${BORG} "$@" >> ${LOGFILE} } convert_rate () { @@ -184,10 +193,10 @@ convert_rate () { RATE=${BASH_REMATCH[1]} else >&2 echo "${IN_RATE} is not a valid rate" - false + false >> ${LOGFILE} fi - echo ${RATE} + echo ${RATE} >> ${LOGFILE} } limit_bw () { @@ -201,7 +210,7 @@ limit_bw () { chmod +x ${PV_WRAPPER} echo -e '#!/bin/bash\npv -q -L ${RATE_LIMIT} | "$@"' > ${PV_WRAPPER} export BORG_RSH="${PV_WRAPPER} ${BORG_RSH}" - echo "Limiting bandwith to ${RATE_LIMIT} bytes/s" + echo "Limiting bandwith to ${RATE_LIMIT} bytes/s" >> ${LOGFILE} } exit_backup () { @@ -290,16 +299,16 @@ mkdir -p "${LOCKDIR}" elif [[ ${MODE} == "backup" ]]; then trap 'exit_backup $?' ERR INT TERM save_package_list - echo "saving package list" + echo "Saving package list..." >> ${LOGFILE} dump_mongo - echo "dumping mongo" + echo "Dumping mongo..." >> ${LOGFILE} dump_sql - echo "dumping sql" + echo "Dumping sql..." >> ${LOGFILE} borg_backup - echo "running borg backup" + echo "Running borg backup..." >> ${LOGFILE} borg_prune - echo "running borg prune" + echo "Running borg prune..." >> ${LOGFILE} exit_backup 0 elif [[ ${MODE} == "verify" ]]; then trap 'exit_verify $?' ERR INT TERM @@ -307,7 +316,7 @@ mkdir -p "${LOCKDIR}" exit_verify 0 elif [[ ${MODE} == "exec" ]]; then if [[ $# -le 1 ]]; then - >&2 echo "ERROR: No borg arguments given" + >&2 echo "ERROR: No borg arguments given" >> ${LOGFILE} exit 1 fi