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

Merge pull request #27 from bhuvi8/master

Browse Source 
Added rsync error handling and modified WARN and ERROR functions to print to stderr
This commit is contained in:
Laurent
2013-12-21 02:26:32 -08:00
parent 7b9de2b5f5 c8ae234904
commit c105c0a9e2
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rsync_tmbackup.sh
Regular → Executable
+11 -9
View File
@@ -7,8 +7,8 @@ APPNAME=$(basename $0 | sed "s/\.sh$//")
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
fn_log_info() { echo "$APPNAME: $1"; } fn_log_info() { echo "$APPNAME: $1"; }
fn_log_warn() { echo "$APPNAME: [WARNING] $1"; } fn_log_warn() { echo "$APPNAME: [WARNING] $1" 1>&2; }
fn_log_error() { echo "$APPNAME: [ERROR] $1"; } fn_log_error() { echo "$APPNAME: [ERROR] $1" 1>&2; }
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Make sure everything really stops when CTRL+C is pressed # Make sure everything really stops when CTRL+C is pressed
@@ -214,7 +214,6 @@ while : ; do
touch -- "$INPROGRESS_FILE" touch -- "$INPROGRESS_FILE"
eval $CMD eval $CMD
RSYNC_EXIT_CODE=$?
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Check if we ran out of space # Check if we ran out of space
@@ -223,8 +222,6 @@ while : ; do
# TODO: find better way to check for out of space condition without parsing log. # TODO: find better way to check for out of space condition without parsing log.
NO_SPACE_LEFT="$(grep "No space left on device (28)\|Result too large (34)" "$LOG_FILE")" NO_SPACE_LEFT="$(grep "No space left on device (28)\|Result too large (34)" "$LOG_FILE")"
rm -- "$LOG_FILE"
if [ -n "$NO_SPACE_LEFT" ]; then if [ -n "$NO_SPACE_LEFT" ]; then
fn_log_warn "No space left on device - removing oldest backup and resuming." fn_log_warn "No space left on device - removing oldest backup and resuming."
@@ -239,9 +236,12 @@ while : ; do
continue continue
fi fi
if [ "$RSYNC_EXIT_CODE" != "0" ]; then # -----------------------------------------------------------------------------
fn_log_error "Exited with error code $RSYNC_EXIT_CODE" # Check whether rsync reported any errors
exit $RSYNC_EXIT_CODE # -----------------------------------------------------------------------------
if [[ "$(sed -n '/rsync error:/p;/rsync:/p' -- "$LOG_FILE" | wc -l)" -ge 1 ]]; then
fn_log_error "Encountered error, please check $LOG_FILE for more details."
exit 1
fi fi
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@@ -252,7 +252,9 @@ while : ; do
ln -vs -- "$(basename -- "$DEST")" "$DEST_FOLDER/latest" ln -vs -- "$(basename -- "$DEST")" "$DEST_FOLDER/latest"
rm -f -- "$INPROGRESS_FILE" rm -f -- "$INPROGRESS_FILE"
# TODO: grep for "^rsync error:.*$" in log rm -- "$LOG_FILE"
fn_log_info "Backup completed without errors." fn_log_info "Backup completed without errors."
exit 0 exit 0
done done