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

Simplify logfile parsing and drop unreachable codepath.

Browse Source
This commit is contained in:
Robert Bruce Park
2013-11-26 13:46:26 -08:00
parent 2e413d82d7
commit bff263ab57
1 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rsync_tmbackup.sh
+4 -17
View File
@@ -235,32 +235,19 @@ while [ "1" ]; 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.
grep --quiet "No space left on device (28)" "$LOG_FILE" NO_SPACE_LEFT="$(grep "No space left on device (28)\|Result too large (34)" "$LOG_FILE")"
NO_SPACE_LEFT="$?"
if [ "$NO_SPACE_LEFT" != "0" ]; then
# This error might also happen if there is no space left
grep --quiet "Result too large (34)" "$LOG_FILE"
NO_SPACE_LEFT="$?"
fi
rm -- "$LOG_FILE" rm -- "$LOG_FILE"
if [ "$NO_SPACE_LEFT" == "0" ]; 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."
BACKUP_FOLDER_COUNT=$(fn_find_backups | wc -l) if [[ "$(fn_find_backups | wc -l)" -lt "2" ]]; then
if [[ "$BACKUP_FOLDER_COUNT" -lt "2" ]]; then
fn_log_error "No space left on device, and no old backup to delete." fn_log_error "No space left on device, and no old backup to delete."
exit 1 exit 1
fi fi
OLD_BACKUP_PATH=$(fn_find_backups | head -n 1) fn_expire_backup "$(fn_find_backups | tail -n 1)"
if [[ "$OLD_BACKUP_PATH" == "" ]]; then
fn_log_error "No space left on device, and cannot get path to oldest backup to delete."
exit 1
fi
fn_expire_backup "$OLD_BACKUP_PATH"
# Resume backup # Resume backup
continue continue