ovh/the-bastion
1
1
Fork 0
mirror of https://github.com/ovh/the-bastion.git synced 2025-09-07 05:24:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

Enhance osh-sync-watcher logs

Browse source 
With server name and step number
This commit is contained in:
Thomas Soëte 2020-10-20 17:36:54 +02:00 • committed by Thomas SOËTE
parent 7d09c83fc5
commit e766a54a35
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bin/admin/osh-sync-watcher.sh
View file

@ -108,8 +108,12 @@ do
_log "Starting sync!"
# shellcheck disable=SC2154
[ -z "$remotehostlist" ] && remotehostlist="$remotehost"
for remote in $remotehostlist
# shellcheck disable=SC2206
remotehosts=( $remotehostlist )
remotehostslen=${#remotehosts[@]}
for i in "${!remotehosts[@]}"
do
remote=${remotehosts[i]}
if echo "$remote" | grep -q ':'; then
remoteport=$(echo "$remote" | cut -d: -f2)
remote=$(echo "$remote" | cut -d: -f1)
@ -117,19 +121,19 @@ do
remoteport=22
fi
if [ -e "$LOCKFILE" ] && [ $(( $(date +%s) - $(stat -c %Y "$LOCKFILE") )) -le 300 ]; then
_log "$remote: [1/3] syncing needed data postponed for next run (upgrade lockfile present)"
_log "$remote: [Server $(($+1))/$remotehostslen - Step 1/3] syncing needed data postponed for next run (upgrade lockfile present)"
else
_log "$remote: [1/3] syncing needed data..."
_log "$remote: [Server $((i+1))/$remotehostslen - Step 1/3] syncing needed data..."
rsync -vaA --numeric-ids --delete --filter "merge $rsyncfilterfile" --rsh "$rshcmd -p $remoteport" / "$remoteuser@$remote:/"
_log "$remote: [1/3] sync ended with return value $?"
_log "$remote: [Server $((i+1))/$remotehostslen - Step 1/3] sync ended with return value $?"
fi
_log "$remote: [2/3] syncing lastlog files from master to slave, only if master version is newer..."
_log "$remote: [Server $((i+1))/$remotehostslen - Step 2/3] syncing lastlog files from master to slave, only if master version is newer..."
rsync -vaA --numeric-ids --update --include '/' --include '/home/' --include '/home/*/' --include '/home/*/lastlog' --exclude='*' --rsh "$rshcmd -p $remoteport" / "$remoteuser@$remote:/"
_log "$remote: [2/3] sync ended with return value $?"
_log "$remote: [Server $((i+1))/$remotehostslen - Step 2/3] sync ended with return value $?"
_log "$remote: [3/3] syncing lastlog files from slave to master, only if slave version is newer..."
_log "$remote: [Server $((i+1))/$remotehostslen - Step 3/3] syncing lastlog files from slave to master, only if slave version is newer..."
find /home -mindepth 2 -maxdepth 2 -type f -name lastlog | rsync -vaA --numeric-ids --update --prune-empty-dirs --include='/' --include='/home' --include='/home/*/' --include-from=- --exclude='*' --rsh "$rshcmd -p $remoteport" "$remoteuser@$remote:/" /
_log "$remote: [3/3] sync ended with return value $?"
_log "$remote: [Server $((i+1))/$remotehostslen - Step 3/3] sync ended with return value $?"
done
done