Archives
/
osync
mirror of https://github.com/deajan/osync
2
0
Fork 0
Code Issues Releases Wiki Activity

Rebuilt targets

Browse Source
pull/93/head
deajan 7 years ago
parent 6fc4bef224
commit e1ea7806cb
2 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File

35
dev/debug_osync.sh
Unescape Escape View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PROGRAM="osync" # Rsync based two way sync engine with fault tolerance PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2017 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.2-RC1+dev PROGRAM_VERSION=1.2-RC1+dev
PROGRAM_BUILD=2016121901 PROGRAM_BUILD=2016121901
@ -42,9 +42,10 @@ IS_STABLE=no
_OFUNCTIONS_VERSION=2.1-RC1+dev _OFUNCTIONS_VERSION=2.1-RC1+dev
_OFUNCTIONS_BUILD=2016122701 _OFUNCTIONS_BUILD=2017010401
_OFUNCTIONS_BOOTSTRAP=true _OFUNCTIONS_BOOTSTRAP=true
## BEGIN Generic bash functions written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## To use in a program, define the following variables: ## To use in a program, define the following variables:
## PROGRAM=program-name ## PROGRAM=program-name
@ -616,7 +617,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }
@ -709,7 +710,7 @@ function WaitForTaskCompletion {
Spinner Spinner
fi fi
if [ $counting == true ]; then if [ $counting == true ]; then
exec_time=$(($SECONDS - $seconds_begin)) exec_time=$((SECONDS - seconds_begin))
else else
exec_time=$SECONDS exec_time=$SECONDS
fi fi
@ -865,7 +866,7 @@ function ParallelExec {
fi fi
if [ $counting == true ]; then if [ $counting == true ]; then
exec_time=$(($SECONDS - $seconds_begin)) exec_time=$((SECONDS - seconds_begin))
else else
exec_time=$SECONDS exec_time=$SECONDS
fi fi
@ -903,7 +904,7 @@ function ParallelExec {
fi fi
eval "HARD_MAX_EXEC_TIME_REACHED_$callerName=true" eval "HARD_MAX_EXEC_TIME_REACHED_$callerName=true"
# Return the number of commands that haven't run / finished run # Return the number of commands that haven't run / finished run
return $(($commandCount - $counter + ${#pidsArray[@]})) return $((commandCount - counter + ${#pidsArray[@]}))
fi fi
while [ $counter -lt "$commandCount" ] && [ ${#pidsArray[@]} -lt $numberOfProcesses ]; do while [ $counter -lt "$commandCount" ] && [ ${#pidsArray[@]} -lt $numberOfProcesses ]; do
@ -926,7 +927,6 @@ function ParallelExec {
if [ $(IsInteger $pid) -eq 1 ]; then if [ $(IsInteger $pid) -eq 1 ]; then
# Handle uninterruptible sleep state or zombies by ommiting them from running process array (How to kill that is already dead ? :) # Handle uninterruptible sleep state or zombies by ommiting them from running process array (How to kill that is already dead ? :)
if kill -0 $pid > /dev/null 2>&1; then if kill -0 $pid > /dev/null 2>&1; then
#pidState=$(ps -p$pid -o state= 2 > /dev/null)
pidState="$(eval $PROCESS_STATE_CMD)" pidState="$(eval $PROCESS_STATE_CMD)"
if [ "$pidState" != "D" ] && [ "$pidState" != "Z" ]; then if [ "$pidState" != "D" ] && [ "$pidState" != "Z" ]; then
newPidsArray+=($pid) newPidsArray+=($pid)
@ -950,7 +950,7 @@ function ParallelExec {
pidsArray=("${newPidsArray[@]}") pidsArray=("${newPidsArray[@]}")
# Trivial wait time for bash to not eat up all CPU # Trivial wait time for bash to not eat up all CPU
sleep $SLEEP_TIME sleep $sleepTime
done done
return $errorCount return $errorCount
@ -966,11 +966,6 @@ function CleanUp {
fi fi
} }
# obsolete, use StripQuotes
function SedStripQuotes {
echo $(echo $1 | sed "s/^\([\"']\)\(.*\)\1\$/\2/g")
}
# Usage: var=$(StripSingleQuotes "$var") # Usage: var=$(StripSingleQuotes "$var")
function StripSingleQuotes { function StripSingleQuotes {
local string="${1}" local string="${1}"
@ -1441,8 +1436,8 @@ function __CheckArguments {
if [ "$argument" == "" ]; then if [ "$argument" == "" ]; then
fetchArguments=false fetchArguments=false
else else
argList="$argList[Argument $(($iterate-2)): $argument] " argList="$argList[Argument $((iterate-2)): $argument] "
iterate=$(($iterate+1)) iterate=$((iterate+1))
fi fi
done done
@ -1458,7 +1453,7 @@ function __CheckArguments {
Logger "Entering function [$callerName]." "PARANOIA_DEBUG" Logger "Entering function [$callerName]." "PARANOIA_DEBUG"
if ! ([ $countedArguments -ge $minArgs ] && [ $countedArguments -le $maxArgs ]); then if ! ([ $countedArguments -ge $minArgs ] && [ $countedArguments -le $maxArgs ]); then
Logger "Function $functionName may have inconsistent number of arguments. Expected min: $minArgs, max: $maxArgs, count: $countedArguments, bash seen: $numberOfGivenArguments. see log file." "ERROR" Logger "Function $callerName may have inconsistent number of arguments. Expected min: $minArgs, max: $maxArgs, count: $countedArguments, bash seen: $numberOfGivenArguments." "ERROR"
Logger "$callerName arguments: $argList" "ERROR" Logger "$callerName arguments: $argList" "ERROR"
else else
if [ ! -z "$argList" ]; then if [ ! -z "$argList" ]; then
@ -2057,7 +2052,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }
function IsInteger { function IsInteger {
@ -2392,7 +2387,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }
## Modified version of http://stackoverflow.com/a/8574392 ## Modified version of http://stackoverflow.com/a/8574392
@ -3246,7 +3241,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }

29
osync.sh
Unescape Escape View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PROGRAM="osync" # Rsync based two way sync engine with fault tolerance PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2017 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.2-RC1+dev PROGRAM_VERSION=1.2-RC1+dev
PROGRAM_BUILD=2016121901 PROGRAM_BUILD=2016121901
@ -11,9 +11,10 @@ IS_STABLE=no
_OFUNCTIONS_VERSION=2.1-RC1+dev _OFUNCTIONS_VERSION=2.1-RC1+dev
_OFUNCTIONS_BUILD=2016122701 _OFUNCTIONS_BUILD=2017010401
_OFUNCTIONS_BOOTSTRAP=true _OFUNCTIONS_BOOTSTRAP=true
## BEGIN Generic bash functions written in 2013-2016 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## BEGIN Generic bash functions written in 2013-2017 by Orsiris de Jong - http://www.netpower.fr - ozy@netpower.fr
## To use in a program, define the following variables: ## To use in a program, define the following variables:
## PROGRAM=program-name ## PROGRAM=program-name
@ -566,7 +567,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }
@ -655,7 +656,7 @@ function WaitForTaskCompletion {
Spinner Spinner
fi fi
if [ $counting == true ]; then if [ $counting == true ]; then
exec_time=$(($SECONDS - $seconds_begin)) exec_time=$((SECONDS - seconds_begin))
else else
exec_time=$SECONDS exec_time=$SECONDS
fi fi
@ -804,7 +805,7 @@ function ParallelExec {
fi fi
if [ $counting == true ]; then if [ $counting == true ]; then
exec_time=$(($SECONDS - $seconds_begin)) exec_time=$((SECONDS - seconds_begin))
else else
exec_time=$SECONDS exec_time=$SECONDS
fi fi
@ -842,7 +843,7 @@ function ParallelExec {
fi fi
eval "HARD_MAX_EXEC_TIME_REACHED_$callerName=true" eval "HARD_MAX_EXEC_TIME_REACHED_$callerName=true"
# Return the number of commands that haven't run / finished run # Return the number of commands that haven't run / finished run
return $(($commandCount - $counter + ${#pidsArray[@]})) return $((commandCount - counter + ${#pidsArray[@]}))
fi fi
while [ $counter -lt "$commandCount" ] && [ ${#pidsArray[@]} -lt $numberOfProcesses ]; do while [ $counter -lt "$commandCount" ] && [ ${#pidsArray[@]} -lt $numberOfProcesses ]; do
@ -865,7 +866,6 @@ function ParallelExec {
if [ $(IsInteger $pid) -eq 1 ]; then if [ $(IsInteger $pid) -eq 1 ]; then
# Handle uninterruptible sleep state or zombies by ommiting them from running process array (How to kill that is already dead ? :) # Handle uninterruptible sleep state or zombies by ommiting them from running process array (How to kill that is already dead ? :)
if kill -0 $pid > /dev/null 2>&1; then if kill -0 $pid > /dev/null 2>&1; then
#pidState=$(ps -p$pid -o state= 2 > /dev/null)
pidState="$(eval $PROCESS_STATE_CMD)" pidState="$(eval $PROCESS_STATE_CMD)"
if [ "$pidState" != "D" ] && [ "$pidState" != "Z" ]; then if [ "$pidState" != "D" ] && [ "$pidState" != "Z" ]; then
newPidsArray+=($pid) newPidsArray+=($pid)
@ -885,7 +885,7 @@ function ParallelExec {
pidsArray=("${newPidsArray[@]}") pidsArray=("${newPidsArray[@]}")
# Trivial wait time for bash to not eat up all CPU # Trivial wait time for bash to not eat up all CPU
sleep $SLEEP_TIME sleep $sleepTime
done done
return $errorCount return $errorCount
@ -900,11 +900,6 @@ function CleanUp {
fi fi
} }
# obsolete, use StripQuotes
function SedStripQuotes {
echo $(echo $1 | sed "s/^\([\"']\)\(.*\)\1\$/\2/g")
}
# Usage: var=$(StripSingleQuotes "$var") # Usage: var=$(StripSingleQuotes "$var")
function StripSingleQuotes { function StripSingleQuotes {
local string="${1}" local string="${1}"
@ -1909,7 +1904,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }
function IsInteger { function IsInteger {
@ -2232,7 +2227,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }
## Modified version of http://stackoverflow.com/a/8574392 ## Modified version of http://stackoverflow.com/a/8574392
@ -3065,7 +3060,7 @@ function TrapError {
local code="${2:-1}" local code="${2:-1}"
if [ $_LOGGER_SILENT == false ]; then if [ $_LOGGER_SILENT == false ]; then
echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m" (>&2 echo -e "\e[45m/!\ ERROR in ${job}: Near line ${line}, exit code ${code}\e[0m")
fi fi
} }

Write Preview
Loading…
Cancel
Save