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

Minor improvements to ExecTasksé

This commit is contained in:
deajan 2018-02-24 16:34:53 +01:00
parent d0bd873def
commit dee5b4037c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dev/ofunctions.sh
View File

@ -10,7 +10,7 @@
#command line arguments don't take -AaqV for example #command line arguments don't take -AaqV for example
_OFUNCTIONS_VERSION=2.3.0-dev _OFUNCTIONS_VERSION=2.3.0-dev
_OFUNCTIONS_BUILD=2018022001 _OFUNCTIONS_BUILD=2018022402
#### _OFUNCTIONS_BOOTSTRAP SUBSET #### #### _OFUNCTIONS_BOOTSTRAP SUBSET ####
_OFUNCTIONS_BOOTSTRAP=true _OFUNCTIONS_BOOTSTRAP=true
#### _OFUNCTIONS_BOOTSTRAP SUBSET END #### #### _OFUNCTIONS_BOOTSTRAP SUBSET END ####
@ -876,12 +876,14 @@ function ExecTasks {
mainItemCount=$(wc -l < "$mainInput") mainItemCount=$(wc -l < "$mainInput")
readFromFile=true readFromFile=true
else else
Logger "Cannot read file [$mainInput]." "WARN" Logger "Cannot read main file [$mainInput]." "WARN"
fi fi
if [ -f "$auxInput" ]; then if [ "$auxInput" != "" ]; then
auxItemCount=$(wc -l < "$auxInput") if [ -f "$auxInput" ]; then
else auxItemCount=$(wc -l < "$auxInput")
Logger "Cannot read file [$auxInput]." "WARN" else
Logger "Cannot read aux file [$auxInput]." "WARN"
fi
fi fi
fi fi
@ -965,7 +967,7 @@ function ExecTasks {
pidsTimeArray[$pid]=$((SECONDS - seconds_begin)) pidsTimeArray[$pid]=$((SECONDS - seconds_begin))
if [ ${pidsTimeArray[$pid]} -gt $softPerProcessTime ]; then if [ ${pidsTimeArray[$pid]} -gt $softPerProcessTime ]; then
if [ "$softAlert" != true ] && [ $softPerProcessTime -ne 0 ] && [ $noTimeErrorLog != true ]; then if [ "$softAlert" != true ] && [ $softPerProcessTime -ne 0 ] && [ $noTimeErrorLog != true ]; then
Logger "Max soft execution time [$softPerProcessTime]exceeded for pid [$pid]." "WARN" Logger "Max soft execution time [$softPerProcessTime] exceeded for pid [$pid]." "WARN"
if [ "${commandsArrayPid[$pid]}]" != "" ]; then if [ "${commandsArrayPid[$pid]}]" != "" ]; then
Logger "Command was [${commandsArrayPid[$pid]}]]." "WARN" Logger "Command was [${commandsArrayPid[$pid]}]]." "WARN"
fi fi