Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ddns-scripts: update_gandi_net: improve logging & add timeout

Browse source 
- Improved logging
  - Log the executed curl command to be able to rerun and test it manually
  - Log the curl exit status
- Added 30 second timeout timeout for clear-cut detection of flaky connections.

Signed-off-by: Pyry Kontio <pyry.kontio@drasa.eu>
This commit is contained in:
Pyry Kontio 2022-11-29 00:15:47 +09:00
parent e04e523a01
commit cefe85250c
No known key found for this signature in database
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ddns-scripts/Makefile
View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ddns-scripts PKG_NAME:=ddns-scripts
PKG_VERSION:=2.8.2 PKG_VERSION:=2.8.2
PKG_RELEASE:=29 PKG_RELEASE:=30
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

13
net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh
View file

@ -20,14 +20,23 @@ json_add_array rrset_values
json_add_string "" "$__IP" json_add_string "" "$__IP"
json_close_array json_close_array
# Log the curl command
write_log 7 "curl -s -X PUT \"$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE\" \
-H \"Authorization: Apikey $password\" \
-H \"Content-Type: application/json\" \
-d \"$(json_dump)\" \
--connect-timeout 30"
__STATUS=$(curl -s -X PUT "$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE" \ __STATUS=$(curl -s -X PUT "$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE" \
-H "Authorization: Apikey $password" \ -H "Authorization: Apikey $password" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-d "$(json_dump)" \ -d "$(json_dump)" \
--connect-timeout 30 \
-w "%{http_code}\n" -o $DATFILE 2>$ERRFILE) -w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
if [ $? -ne 0 ]; then local __ERRNO=$?
write_log 14 "Curl failed: $(cat $ERRFILE)" if [ $__ERRNO -ne 0 ]; then
write_log 14 "Curl failed with $__ERRNO: $(cat $ERRFILE)"
return 1 return 1
elif [ -z $__STATUS ] || [ $__STATUS != 201 ]; then elif [ -z $__STATUS ] || [ $__STATUS != 201 ]; then
write_log 14 "LiveDNS failed: $__STATUS \ngandi.net answered: $(cat $DATFILE)" write_log 14 "LiveDNS failed: $__STATUS \ngandi.net answered: $(cat $DATFILE)"