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

Rebuilt targets

This commit is contained in:
deajan 2020-01-23 18:47:01 +01:00
parent eaeb218508
commit c2fef97c84
2 changed files with 60 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dev/debug_osync.sh
View File

@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2020 by Orsiris de Jong" AUTHOR="(C) 2013-2020 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.3.0-prerc1 PROGRAM_VERSION=1.3.0-prerc1
PROGRAM_BUILD=2019122406 PROGRAM_BUILD=2020012301
IS_STABLE=false IS_STABLE=false
CONFIG_FILE_REVISION_REQUIRED=1.3.0 CONFIG_FILE_REVISION_REQUIRED=1.3.0
@ -2659,6 +2659,7 @@ function _CheckReplicasLocal {
return 1 return 1
fi fi
if [ $MINIMUM_SPACE -ne 0 ]; then
Logger "Checking minimum disk space in local replica [$replicaPath]." "NOTICE" Logger "Checking minimum disk space in local replica [$replicaPath]." "NOTICE"
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}') diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}')
retval=$? retval=$?
@ -2674,6 +2675,8 @@ function _CheckReplicasLocal {
Logger "There is not enough free space on local replica [$replicaPath] ($diskSpace KB)." "WARN" Logger "There is not enough free space on local replica [$replicaPath] ($diskSpace KB)." "WARN"
fi fi
fi fi
fi
return $retval
} }
function _CheckReplicasRemote { function _CheckReplicasRemote {
@ -2922,6 +2925,7 @@ function _CheckReplicasRemoteSub {
exit 1 exit 1
fi fi
if [ $MINIMUM_SPACE -ne 0 ]; then
RemoteLogger "Checking minimum disk space in remote replica [$replicaPath]." "NOTICE" RemoteLogger "Checking minimum disk space in remote replica [$replicaPath]." "NOTICE"
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}') diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}')
retval=$? retval=$?
@ -2937,6 +2941,7 @@ function _CheckReplicasRemoteSub {
RemoteLogger "There is not enough free space on remote replica [$replicaPath] ($diskSpace KB)." "WARN" RemoteLogger "There is not enough free space on remote replica [$replicaPath] ($diskSpace KB)." "WARN"
fi fi
fi fi
fi
return $retval return $retval
} }
_CheckReplicasRemoteSub _CheckReplicasRemoteSub

7
osync.sh
View File

@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2020 by Orsiris de Jong" AUTHOR="(C) 2013-2020 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.3.0-prerc1 PROGRAM_VERSION=1.3.0-prerc1
PROGRAM_BUILD=2019122406 PROGRAM_BUILD=2020012301
IS_STABLE=false IS_STABLE=false
CONFIG_FILE_REVISION_REQUIRED=1.3.0 CONFIG_FILE_REVISION_REQUIRED=1.3.0
@ -2506,6 +2506,7 @@ function _CheckReplicasLocal {
return 1 return 1
fi fi
if [ $MINIMUM_SPACE -ne 0 ]; then
Logger "Checking minimum disk space in local replica [$replicaPath]." "NOTICE" Logger "Checking minimum disk space in local replica [$replicaPath]." "NOTICE"
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}') diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}')
retval=$? retval=$?
@ -2521,6 +2522,8 @@ function _CheckReplicasLocal {
Logger "There is not enough free space on local replica [$replicaPath] ($diskSpace KB)." "WARN" Logger "There is not enough free space on local replica [$replicaPath] ($diskSpace KB)." "WARN"
fi fi
fi fi
fi
return $retval
} }
function _CheckReplicasRemote { function _CheckReplicasRemote {
@ -2759,6 +2762,7 @@ function _CheckReplicasRemoteSub {
exit 1 exit 1
fi fi
if [ $MINIMUM_SPACE -ne 0 ]; then
RemoteLogger "Checking minimum disk space in remote replica [$replicaPath]." "NOTICE" RemoteLogger "Checking minimum disk space in remote replica [$replicaPath]." "NOTICE"
diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}') diskSpace=$($DF_CMD "$replicaPath" | tail -1 | awk '{print $4}')
retval=$? retval=$?
@ -2774,6 +2778,7 @@ function _CheckReplicasRemoteSub {
RemoteLogger "There is not enough free space on remote replica [$replicaPath] ($diskSpace KB)." "WARN" RemoteLogger "There is not enough free space on remote replica [$replicaPath] ($diskSpace KB)." "WARN"
fi fi
fi fi
fi
return $retval return $retval
} }
_CheckReplicasRemoteSub _CheckReplicasRemoteSub