diff options
| author | Pyry Kontio <pyry.kontio@drasa.eu> | 2022-11-29 00:15:47 +0900 |
|---|---|---|
| committer | Pyry Kontio <pyry.kontio@drasa.eu> | 2022-12-10 03:37:19 +0900 |
| commit | cefe85250ccfd7e3c9872d714e913ca2162ccbf4 (patch) | |
| tree | 2ef5e29493f4054dfb8b53a676813c199e49bad3 /net | |
| parent | e04e523a01f5144a60541e6468a9f4451f26c8ab (diff) | |
ddns-scripts: update_gandi_net: improve logging & add timeout
- 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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ddns-scripts/Makefile | 2 | ||||
| -rw-r--r-- | net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 8c51476c3..f5a264e3c 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=2.8.2 -PKG_RELEASE:=29 +PKG_RELEASE:=30 PKG_LICENSE:=GPL-2.0 diff --git a/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh b/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh index 8953072e4..321687d70 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh @@ -20,14 +20,23 @@ json_add_array rrset_values json_add_string "" "$__IP" 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" \ -H "Authorization: Apikey $password" \ -H "Content-Type: application/json" \ -d "$(json_dump)" \ + --connect-timeout 30 \ -w "%{http_code}\n" -o $DATFILE 2>$ERRFILE) -if [ $? -ne 0 ]; then - write_log 14 "Curl failed: $(cat $ERRFILE)" +local __ERRNO=$? +if [ $__ERRNO -ne 0 ]; then + write_log 14 "Curl failed with $__ERRNO: $(cat $ERRFILE)" return 1 elif [ -z $__STATUS ] || [ $__STATUS != 201 ]; then write_log 14 "LiveDNS failed: $__STATUS \ngandi.net answered: $(cat $DATFILE)" |