Changed all error indexes to include timestamp

This commit is contained in:
Asif Bacchus 2018-10-23 05:13:48 -06:00
parent 843edfff8e
commit 0718413d79

View File

@ -198,7 +198,7 @@ function cleanup {
echo -e "${info}${stamp} -- [INFO] NextCloud now in regular" \ echo -e "${info}${stamp} -- [INFO] NextCloud now in regular" \
"operating mode --${normal}" >> "$logFile" "operating mode --${normal}" >> "$logFile"
else else
exitError+=('101') exitError+=("${stamp}_101")
quit quit
fi fi
} }
@ -513,7 +513,7 @@ if [ "$maintResult" = "0" ]; then
echo -e "${info}${stamp} -- [INFO] NextCloud now in maintenance mode --" \ echo -e "${info}${stamp} -- [INFO] NextCloud now in maintenance mode --" \
"${normal}" >> "$logFile" "${normal}" >> "$logFile"
else else
exitError+=('100') exitError+=("${stamp}_100")
cleanup cleanup
quit quit
fi fi
@ -534,7 +534,7 @@ if [ "$dumpResult" = "0" ]; then
echo -e "${ok}${stamp} -- [SUCCESS] SQL dumped successfully --${normal}" \ echo -e "${ok}${stamp} -- [SUCCESS] SQL dumped successfully --${normal}" \
>> "$logFile" >> "$logFile"
else else
exitError+=('200') exitError+=("${stamp}_200")
cleanup cleanup
quit quit
fi fi
@ -552,7 +552,7 @@ mapfile -t borgConfig < "$borgDetails"
echo -e "${op}${stamp} Verifying supplied borg configuration variables..." \ echo -e "${op}${stamp} Verifying supplied borg configuration variables..." \
"${normal}" >> "$logFile" "${normal}" >> "$logFile"
if [ -z "${borgConfig[0]}" ]; then if [ -z "${borgConfig[0]}" ]; then
exitError+=('210') exitError+=("${stamp}_210")
cleanup cleanup
quit quit
else else
@ -561,7 +561,7 @@ else
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "1" ]; then if [ "$checkResult" = "1" ]; then
# borg base directory specified could not be found # borg base directory specified could not be found
exitError+=('210') exitError+=("${stamp}_210")
cleanup cleanup
quit quit
fi fi
@ -570,7 +570,7 @@ else
fi fi
# check: path to SSH keyfile # check: path to SSH keyfile
if [ -z "${borgConfig[1]}" ]; then if [ -z "${borgConfig[1]}" ]; then
exitError+=('211') exitError+=("${stamp}_211")
cleanup cleanup
quit quit
else else
@ -578,7 +578,7 @@ else
checkResult="$?" checkResult="$?"
if [ "$checkResult" = 1 ]; then if [ "$checkResult" = 1 ]; then
# SSH keyfile specified could not be found # SSH keyfile specified could not be found
exitError+=('211') exitError+=("${stamp}_211")
cleanup cleanup
quit quit
fi fi
@ -587,7 +587,7 @@ else
fi fi
# check: name of borg repo # check: name of borg repo
if [ -z "${borgConfig[2]}" ]; then if [ -z "${borgConfig[2]}" ]; then
exitError+=('212') exitError+=("${stamp}_212")
cleanup cleanup
quit quit
else else
@ -682,7 +682,7 @@ if [ "$checkResult" = "1" ]; then
"${normal}" >> "$logFile" "${normal}" >> "$logFile"
else else
# problem creating folder and script will exit # problem creating folder and script will exit
exitError+=('215') exitError+=("${stamp}_215")
cleanup cleanup
quit quit
fi fi
@ -724,7 +724,7 @@ if [ "$borgResult" -eq 0 ]; then
elif [ "$borgResult" -eq 1 ]; then elif [ "$borgResult" -eq 1 ]; then
exitWarn+=("${stamp}_2200") exitWarn+=("${stamp}_2200")
elif [ "$borgResult" -ge 2 ]; then elif [ "$borgResult" -ge 2 ]; then
exitError+=('220') exitError+=("${stamp}_220")
cleanup cleanup
quit quit
else else
@ -747,7 +747,7 @@ if [ -n "$borgPrune" ]; then
elif [ "$pruneResult" -eq 1 ]; then elif [ "$pruneResult" -eq 1 ]; then
exitWarn+=("${stamp}_2210") exitWarn+=("${stamp}_2210")
elif [ "$pruneResult" -ge 2 ]; then elif [ "$pruneResult" -ge 2 ]; then
exitError+=('221') exitError+=("${stamp}_221")
else else
exitWarn+=("${stamp}_2212") exitWarn+=("${stamp}_2212")
fi fi