fix(log): Prevent preflight duplicate logging
Prevent writing preflight error messages to the console twice when using console logging mode.
This commit is contained in:
@@ -343,21 +343,23 @@ done
|
||||
### pre-flight checks
|
||||
if ! command -v curl >/dev/null; then
|
||||
printf "\n%sThis script requires 'curl' be installed and accessible. Exiting.%s\n\n" "$err" "$norm"
|
||||
writePlainTextLog "'curl' must be installed and accessible" "fatal" "fail" "preexec" 2
|
||||
[ "$logToConsole" -eq 0 ] && writePlainTextLog "'curl' must be installed and accessible" "fatal" "fail" "preexec" 2
|
||||
exit 2
|
||||
fi
|
||||
if ! command -v jq >/dev/null; then
|
||||
printf "\n%sThis script requires 'jq' be installed and accessible. Exiting.%s\n\n" "$err" "$norm"
|
||||
writePlainTextLog "'jq' must be installed and accessible" "fatal" "fail" "preexec" 2
|
||||
[ "$logToConsole" -eq 0 ] && writePlainTextLog "'jq' must be installed and accessible" "fatal" "fail" "preexec" 2
|
||||
exit 2
|
||||
fi
|
||||
if [ -z "$dnsRecords" ]; then
|
||||
badParam errMsg "You must specify at least one DNS record to update. Exiting."
|
||||
[ "$logToConsole" -eq 0 ] &&
|
||||
writePlainTextLog "At least one DNS record to update must be specified" "fatal" "fail" "params" 1
|
||||
fi
|
||||
# verify the credentials file exists and is not empty (default check)
|
||||
if [ ! -f "$accountFile" ] || [ ! -s "$accountFile" ]; then
|
||||
badParam errMsg "Cannot find the Cloudflare credentials file (${accountFile}). Exiting."
|
||||
[ "$logToConsole" -eq 0 ] &&
|
||||
writePlainTextLog "Cannot find the specified Cloudflare credentials file (${accountFile})" "fatal" "fail" "params" 1
|
||||
fi
|
||||
if [ "$logToJournal" -eq 1 ] && ! command -v logger >/dev/null 2>&1; then
|
||||
|
||||
Reference in New Issue
Block a user