OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ddns-scripts: Fixup dnspod.cn-v3 

Migrate retry_count to retry_max_count in the script to fix infinite retry loop.

Signed-off-by: FriesI23 Qin <FriesI23@outlook.com>
This commit is contained in:
FriesI23 Qin 2025-01-16 08:27:20 +08:00 committed by Florian Eckert
parent 9d5da216c9
commit 0dceb9d0f1
2 changed files with 9 additions and 5 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:=57 PKG_RELEASE:=58
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

12
net/ddns-scripts/files/usr/lib/ddns/update_dnspod_cn_v3.sh
View File

@ -8,6 +8,9 @@
# - at: net/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh # - at: net/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh
# - github.com/nixonli/ddns-scripts_dnspod for "update_dnspod_cn.sh" # - github.com/nixonli/ddns-scripts_dnspod for "update_dnspod_cn.sh"
# #
# v1.2.0:
# - Migrate retry_count to retry_max_count
# - Fix signature expiration during retries
# v1.1.0: Publish script # v1.1.0: Publish script
# #
# 2024 FriesI23 <FriesI23@outlook.com> # 2024 FriesI23 <FriesI23@outlook.com>
@ -44,6 +47,7 @@ local __URLHOST="dnspod.tencentcloudapi.com"
local __URLBASE="https://$__URLHOST" local __URLBASE="https://$__URLHOST"
local __METHOD="POST" local __METHOD="POST"
local __CONTENT_TYPE="application/json" local __CONTENT_TYPE="application/json"
local __RETRY_COUNT=${retry_count:-$retry_max_count}
# Build base command to use # Build base command to use
local __PRGBASE="$CURL -RsS -o $DATFILE --stderr $ERRFILE" local __PRGBASE="$CURL -RsS -o $DATFILE --stderr $ERRFILE"
@ -90,11 +94,11 @@ tencentcloud_transfer() {
} }
__CNT=$(($__CNT + 1)) # increment error counter __CNT=$(($__CNT + 1)) # increment error counter
# if error count > retry_count leave here # if error count > __RETRY_COUNT leave here
[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && [ $__RETRY_COUNT -gt 0 -a $__CNT -gt $__RETRY_COUNT ] &&
write_log 14 "Transfer failed after $retry_count retries" write_log 14 "Transfer failed after $__RETRY_COUNT retries"
write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds" write_log 4 "Transfer failed - retry $__CNT/$__RETRY_COUNT in $RETRY_SECONDS seconds"
sleep $RETRY_SECONDS & sleep $RETRY_SECONDS &
PID_SLEEP=$! PID_SLEEP=$!
wait $PID_SLEEP # enable trap-handler wait $PID_SLEEP # enable trap-handler