From be8e70a1c51a7d5513bc58939291860b9690c8cc Mon Sep 17 00:00:00 2001 From: mwolson_admin Date: Sun, 18 Nov 2007 21:21:11 -0500 Subject: [PATCH] apache-sync-logs: Skip empty source directories --- apache-sync-logs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/apache-sync-logs b/apache-sync-logs index 229cf20..6e83894 100755 --- a/apache-sync-logs +++ b/apache-sync-logs @@ -28,14 +28,19 @@ for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do LOG_DEST=$AFS_USER_DIR/$PATHBITS/.logs/apache/ TMP_DEST=$LOG_SRC.tmp - if [ "$VERBOSE" = "true" ]; then + # Skip deleted or empty log directories + if test ! -d "$LOG_SRC" || ! ls "$LOG_SRC"/*/*/*.log >/dev/null 2>&1; then + continue + fi + + if test "$VERBOSE" = "true"; then echo echo "==============================================================================" echo "syncing logs for $USER from $A" echo " to $LOG_DEST ..." fi - if [ ! -d "$LOG_DEST" ]; then + if test ! -d "$LOG_DEST"; then echo "Error: $LOG_DEST does not exist, please make it" ERROR=yes else @@ -46,11 +51,11 @@ for A in $(find $LOCAL_LOG_DIR -mindepth 3 -maxdepth 3 -print); do k5start -qtU -f $KEYTAB_DIR/$USER \ -- su $USER -c "rsync -a $TMP_DEST/ $LOG_DEST/" rm -fr $TMP_DEST - [ "$VERBOSE" = "true" ] && echo " done." + test "$VERBOSE" = "true" && echo " done." fi done -if [ "$ERROR" = "yes" ]; then +if test "$ERROR" = "yes"; then exit 1 else exit 0 -- 2.20.1