WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged all tree functions.

This commit is contained in:
deajan 2013-11-04 22:17:06 +01:00
parent 194e458d16
commit 4535b48012
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osync.sh
View File

@ -3,7 +3,7 @@
###### Osync - Rsync based two way sync engine with fault tolerance ###### Osync - Rsync based two way sync engine with fault tolerance
###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr) ###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr)
OSYNC_VERSION=0.99RC2 OSYNC_VERSION=0.99RC2
OSYNC_BUILD=0411201301 OSYNC_BUILD=0411201302
DEBUG=no DEBUG=no
SCRIPT_PID=$$ SCRIPT_PID=$$
@ -172,20 +172,7 @@ function CleanUp
{ {
if [ "$DEBUG" != "yes" ] if [ "$DEBUG" != "yes" ]
then then
rm -f $RUN_DIR/osync_config_$SCRIPT_PID rm -f $RUN_DIR/osync_*_$SCRIPT_PID
rm -f $RUN_DIR/osync_remote_os_$SCRIPT_PID
rm -f $RUN_DIR/osync_run_local_$SCRIPT_PID
rm -f $RUN_DIR/osync_run_remote_$SCRIPT_PID
rm -f $RUN_DIR/osync_master-tree-current_$SCRIPT_PID
rm -f $RUN_DIR/osync_slave-tree-current_$SCRIPT_PID
rm -f $RUN_DIR/osync_master-tree-after_$SCRIPT_PID
rm -f $RUN_DIR/osync_slave-tree-after_$SCRIPT_PID
rm -f $RUN_DIR/osync_update_master_replica_$SCRIPT_PID
rm -f $RUN_DIR/osync_update_slave_replica_$SCRIPT_PID
rm -f $RUN_DIR/osync_deletion_on_master_$SCRIPT_PID
rm -f $RUN_DIR/osync_deletion_on_slave_$SCRIPT_PID
rm -f $RUN_DIR/osync_remote_slave_lock_$SCRIPT_PID
rm -f $RUN_DIR/osync_slave_space_$SCRIPT_PID
fi fi
} }
@ -863,9 +850,9 @@ function tree_list
CheckConnectivity3rdPartyHosts CheckConnectivity3rdPartyHosts
CheckConnectivityRemoteHost CheckConnectivityRemoteHost
ESC=$(EscapeSpaces "$1") ESC=$(EscapeSpaces "$1")
rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -rlptgoDE8 $RSYNC_ARGS --exclude \"$OSYNC_DIR\" $RSYNC_EXCLUDE -e \"$RSYNC_SSH_CMD\" --list-only $REMOTE_USER@$REMOTE_HOST:\"$ESC/\" | grep \"^-\|^d\" | awk '{\$1=\$2=\$3=\$4=\"\" ;print}' | awk '{\$1=\$1 ;print}' | (grep -v \"^\.$\" || :) | sort > \"$RUN_DIR/$2_$SCRIPT_PID\" &" rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -rlptgoDE8 $RSYNC_ARGS --exclude \"$OSYNC_DIR\" $RSYNC_EXCLUDE -e \"$RSYNC_SSH_CMD\" --list-only $REMOTE_USER@$REMOTE_HOST:\"$ESC/\" | grep \"^-\|^d\" | awk '{\$1=\$2=\$3=\$4=\"\" ;print}' | awk '{\$1=\$1 ;print}' | (grep -v \"^\.$\" || :) | sort > \"$RUN_DIR/osync_$2_$SCRIPT_PID\" &"
else else
rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -rlptgoDE8 $RSYNC_ARGS --exclude \"$OSYNC_DIR\" $RSNYC_EXCLUDE --list-only \"$1/\" | grep \"^-\|^d\" | awk '{\$1=\$2=\$3=\$4=\"\" ;print}' | awk '{\$1=\$1 ;print}' | (grep -v \"^\.$\" || :) | sort > $RUN_DIR/$2_$SCRIPT_PID &" rsync_cmd="$(type -p $RSYNC_EXECUTABLE) --rsync-path=\"$RSYNC_PATH\" -rlptgoDE8 $RSYNC_ARGS --exclude \"$OSYNC_DIR\" $RSNYC_EXCLUDE --list-only \"$1/\" | grep \"^-\|^d\" | awk '{\$1=\$2=\$3=\$4=\"\" ;print}' | awk '{\$1=\$1 ;print}' | (grep -v \"^\.$\" || :) | sort > $RUN_DIR/osync_$2_$SCRIPT_PID &"
fi fi
if [ "$DEBUG" == "yes" ] if [ "$DEBUG" == "yes" ]
then then
@ -877,7 +864,7 @@ function tree_list
retval=$? retval=$?
if [ $retval == 0 ] && [ -f $RUN_DIR/$2_$SCRIPT_PID ] if [ $retval == 0 ] && [ -f $RUN_DIR/$2_$SCRIPT_PID ]
then then
mv $RUN_DIR/$2_$SCRIPT_PID "$MASTER_SYNC_DIR/$STATE_DIR/$2" mv $RUN_DIR/osync_$2_$SCRIPT_PID "$MASTER_SYNC_DIR/$STATE_DIR/$2"
echo "$3.success" > "$MASTER_SYNC_DIR/$STATE_DIR/last-action" echo "$3.success" > "$MASTER_SYNC_DIR/$STATE_DIR/last-action"
else else
LogError "Cannot create replica file list." LogError "Cannot create replica file list."