From: Lehua Zhang <sxlehua@qq.com>
Date: Wed, 26 Feb 2025 09:16:58 +0000 (+0800)
Subject: ddns-scripts: Fixup huaweicloud
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=bb4861efb1aef5f451b4eab2b483f3b26bc2ef60;p=feed%2Fpackages.git

ddns-scripts: Fixup huaweicloud

Script will exit when an error occurred.

Modify write_log 14 to write_log 4,
write_log 14 and write_log 4 can also print the same message,
but write_log 14 will exist script when printed.

Signed-off-by: Lehua Zhang <sxlehua@qq.com>
---

diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile
index aa31b1fe9e..2db9b94483 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:=64
+PKG_RELEASE:=65
 
 PKG_LICENSE:=GPL-2.0
 
diff --git a/net/ddns-scripts/files/usr/lib/ddns/update_huaweicloud_com.sh b/net/ddns-scripts/files/usr/lib/ddns/update_huaweicloud_com.sh
index 1c21b1d2e7..1ce866cd4d 100644
--- a/net/ddns-scripts/files/usr/lib/ddns/update_huaweicloud_com.sh
+++ b/net/ddns-scripts/files/usr/lib/ddns/update_huaweicloud_com.sh
@@ -85,7 +85,7 @@ hcloud_transfer() {
 		"https://$reqUrl"
 
 	if [ $? -ne 0 ]; then
-		write_log 14 "rest api error"
+		write_log 4 "rest api error"
 	fi
 }
 
@@ -93,8 +93,10 @@ get_zone() {
 	local resp=`hcloud_transfer GET /v2/zones "name=$__DOMAIN.&search_mode=equal" ""`
 	__ZONE_ID=`printf "%s" $resp |  grep -Eo '"id":"[a-z0-9]+"' | cut -d':' -f2 | tr -d '"'`
 	if [ "$__ZONE_ID" = "" ]; then
-		write_log 14 "error, no zone"
+		write_log 4 "query zone error [$resp]"
+		return 1
 	fi
+	return 0
 }
 
 upd_record() {
@@ -104,8 +106,10 @@ upd_record() {
 	if [ ! "$recordId" = "" ]; then
 		write_log 7 "upd [$recordId] success [$__TYPE] [$__IP]"
 	else
-		write_log 14 "upd ecord error [$resp]"
+		write_log 4 "upd ecord error [$resp]"
+		return 1
 	fi
+	return 0
 }
 
 add_record() {
@@ -115,8 +119,10 @@ add_record() {
 	if [ ! "$recordId" = "" ]; then
 		write_log 7 "add [$recordId] success [$__TYPE] [$__IP]"
 	else
-		write_log 14 "add record error [$resp]"
+		write_log 4 "add record error [$resp]"
+		return 1
 	fi
+	return 0
 }
 
 # Get DNS record
@@ -137,16 +143,18 @@ get_record() {
 	return $ret
 }
 
-get_zone
+get_zone || return 1
 get_record
 
 ret=$?
 if [ $ret -eq 0 ]; then
 	write_log 7 "nochg [$__IP]"
 fi
+
 if [ $ret -eq 1 ]; then
 	add_record
 fi
+
 if [ $ret -eq 2 ]; then
 	upd_record
 fi