asif/CloudflareDDNS
1
0
Fork 0
Code Issues Pull Requests Releases 4 Activity

fix(log): Prevent preflight duplicate logging

Browse Source 
Prevent writing preflight error messages to the console twice when using console logging mode.
This commit is contained in:
Asif Bacchus
2026-07-24 01:08:54 -06:00
parent c792ec8a0a
commit 2b0128d0c1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cfddns.sh
+6 -4
View File
@@ -343,22 +343,24 @@ done
### pre-flight checks ### pre-flight checks
if ! command -v curl >/dev/null; then if ! command -v curl >/dev/null; then
printf "\n%sThis script requires 'curl' be installed and accessible. Exiting.%s\n\n" "$err" "$norm" 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 exit 2
fi fi
if ! command -v jq >/dev/null; then if ! command -v jq >/dev/null; then
printf "\n%sThis script requires 'jq' be installed and accessible. Exiting.%s\n\n" "$err" "$norm" 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 exit 2
fi fi
if [ -z "$dnsRecords" ]; then if [ -z "$dnsRecords" ]; then
badParam errMsg "You must specify at least one DNS record to update. Exiting." badParam errMsg "You must specify at least one DNS record to update. Exiting."
writePlainTextLog "At least one DNS record to update must be specified" "fatal" "fail" "params" 1 [ "$logToConsole" -eq 0 ] &&
writePlainTextLog "At least one DNS record to update must be specified" "fatal" "fail" "params" 1
fi fi
# verify the credentials file exists and is not empty (default check) # verify the credentials file exists and is not empty (default check)
if [ ! -f "$accountFile" ] || [ ! -s "$accountFile" ]; then if [ ! -f "$accountFile" ] || [ ! -s "$accountFile" ]; then
badParam errMsg "Cannot find the Cloudflare credentials file (${accountFile}). Exiting." badParam errMsg "Cannot find the Cloudflare credentials file (${accountFile}). Exiting."
writePlainTextLog "Cannot find the specified Cloudflare credentials file (${accountFile})" "fatal" "fail" "params" 1 [ "$logToConsole" -eq 0 ] &&
writePlainTextLog "Cannot find the specified Cloudflare credentials file (${accountFile})" "fatal" "fail" "params" 1
fi fi
if [ "$logToJournal" -eq 1 ] && ! command -v logger >/dev/null 2>&1; then if [ "$logToJournal" -eq 1 ] && ! command -v logger >/dev/null 2>&1; then
printf "\n%sThis script requires 'logger' be installed to write entries to your journaling system. Exiting.%s\n\n" "$err" "$norm" printf "\n%sThis script requires 'logger' be installed to write entries to your journaling system. Exiting.%s\n\n" "$err" "$norm"