Skip to content

Commit 041442d

Browse files
committed
fix(tproxy): CN IP 列表下载失败时回退使用已有旧文件
1 parent b1b611a commit 041442d

1 file changed

Lines changed: 18 additions & 16 deletions

File tree

src/module/scripts/network/tproxy.sh

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -708,17 +708,18 @@ download_cn_ip_list() {
708708
log Info "Fetching latest China IP list from $CN_IP_URL"
709709

710710
if ! download_file "$CN_IP_URL" "$CONFIG_DIR/$CN_IP_FILE.tmp"; then
711-
log Error "Failed to download China IP list"
712-
log Debug "[EXEC] rm -f $CONFIG_DIR/$CN_IP_FILE.tmp"
711+
log Warn "Failed to download China IP list"
713712
rm -f "$CONFIG_DIR/$CN_IP_FILE.tmp"
714-
return 1
715-
fi
716-
717-
log Debug "[EXEC] mv $CONFIG_DIR/$CN_IP_FILE.tmp $CONFIG_DIR/$CN_IP_FILE"
718-
if [ "$DRY_RUN" -eq 0 ]; then
713+
if [ -f "$CONFIG_DIR/$CN_IP_FILE" ]; then
714+
log Info "Falling back to existing China IP list"
715+
else
716+
log Error "No existing China IP list available"
717+
return 1
718+
fi
719+
else
719720
mv "$CONFIG_DIR/$CN_IP_FILE.tmp" "$CONFIG_DIR/$CN_IP_FILE"
721+
log Info "China IP list saved to $CONFIG_DIR/$CN_IP_FILE"
720722
fi
721-
log Info "China IP list saved to $CONFIG_DIR/$CN_IP_FILE"
722723
else
723724
log Debug "Using existing China IP list: $CONFIG_DIR/$CN_IP_FILE"
724725
fi
@@ -730,17 +731,18 @@ download_cn_ip_list() {
730731
log Info "Fetching latest China IPv6 list from $CN_IPV6_URL"
731732

732733
if ! download_file "$CN_IPV6_URL" "$CONFIG_DIR/$CN_IPV6_FILE.tmp"; then
733-
log Error "Failed to download China IPv6 list"
734-
log Debug "[EXEC] rm -f $CONFIG_DIR/$CN_IPV6_FILE.tmp"
734+
log Warn "Failed to download China IPv6 list"
735735
rm -f "$CONFIG_DIR/$CN_IPV6_FILE.tmp"
736-
return 1
737-
fi
738-
739-
log Debug "[EXEC] mv $CONFIG_DIR/$CN_IPV6_FILE.tmp $CONFIG_DIR/$CN_IPV6_FILE"
740-
if [ "$DRY_RUN" -eq 0 ]; then
736+
if [ -f "$CONFIG_DIR/$CN_IPV6_FILE" ]; then
737+
log Info "Falling back to existing China IPv6 list"
738+
else
739+
log Error "No existing China IPv6 list available"
740+
return 1
741+
fi
742+
else
741743
mv "$CONFIG_DIR/$CN_IPV6_FILE.tmp" "$CONFIG_DIR/$CN_IPV6_FILE"
744+
log Info "China IPv6 list saved to $CONFIG_DIR/$CN_IPV6_FILE"
742745
fi
743-
log Info "China IPv6 list saved to $CONFIG_DIR/$CN_IPV6_FILE"
744746
else
745747
log Debug "Using existing China IPv6 list: $CONFIG_DIR/$CN_IPV6_FILE"
746748
fi

0 commit comments

Comments
 (0)