Fixed multiple log messages since lower sleep time
This commit is contained in:
parent
2f827f9246
commit
0ea1a3e5de
|
@ -31,6 +31,7 @@ UNDER WORK
|
|||
RECENT CHANGES
|
||||
--------------
|
||||
|
||||
- Fixed multiple keep logging messages since sleep time between commands has been lowered under a second
|
||||
- Added optional checksum parameter for the paranoid :)
|
||||
- Fixed typo in soft deletion code preventing logging slave deleted backup files
|
||||
- Removed legacy lockfile code from init script
|
||||
|
|
12
osync.sh
12
osync.sh
|
@ -4,7 +4,7 @@ PROGRAM="Osync" # Rsync based two way sync engine with fault tolerance
|
|||
AUTHOR="(L) 2013-2015 by Orsiris \"Ozy\" de Jong"
|
||||
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
|
||||
PROGRAM_VERSION=1.00pre
|
||||
PROGRAM_BUILD=1304201501
|
||||
PROGRAM_BUILD=2004201501
|
||||
|
||||
## type doesn't work on platforms other than linux (bash). If if doesn't work, always assume output is not a zero exitcode
|
||||
if ! type -p "$BASH" > /dev/null
|
||||
|
@ -393,6 +393,7 @@ function GetRemoteOS
|
|||
function WaitForTaskCompletion
|
||||
{
|
||||
soft_alert=0
|
||||
log_ttime=0
|
||||
SECONDS_BEGIN=$SECONDS
|
||||
while eval "$PROCESS_TEST_CMD" > /dev/null
|
||||
do
|
||||
|
@ -400,8 +401,12 @@ function WaitForTaskCompletion
|
|||
EXEC_TIME=$(($SECONDS - $SECONDS_BEGIN))
|
||||
if [ $((($EXEC_TIME + 1) % $KEEP_LOGGING)) -eq 0 ]
|
||||
then
|
||||
if [ $log_ttime -ne $EXEC_TIME ]
|
||||
then
|
||||
log_ttime=$EXEC_TIME
|
||||
Log "Current task still running."
|
||||
fi
|
||||
fi
|
||||
if [ $EXEC_TIME -gt "$2" ]
|
||||
then
|
||||
if [ $soft_alert -eq 0 ] && [ "$2" != 0 ]
|
||||
|
@ -438,13 +443,18 @@ function WaitForTaskCompletion
|
|||
function WaitForCompletion
|
||||
{
|
||||
soft_alert=0
|
||||
log_time=0
|
||||
while eval "$PROCESS_TEST_CMD" > /dev/null
|
||||
do
|
||||
Spinner
|
||||
if [ $((($SECONDS + 1) % $KEEP_LOGGING)) -eq 0 ]
|
||||
then
|
||||
if [ $log_time -ne $EXEC_TIME ]
|
||||
then
|
||||
log_time=$EXEC_TIME
|
||||
Log "Current task still running."
|
||||
fi
|
||||
fi
|
||||
if [ $SECONDS -gt "$2" ]
|
||||
then
|
||||
if [ $soft_alert -eq 0 ] && [ "$2" != 0 ]
|
||||
|
|
Loading…
Reference in New Issue