bughz/backtrace
1
0
Fork 0
mirror of https://github.com/oneclickvirt/backtrace.git synced 2025-08-28 18:20:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 区分直接接入和间接接入的Tier1

Browse Source
This commit is contained in:
spiritlhl 2025-08-05 17:14:07 +08:00 committed by GitHub
parent 02804c1b21
commit a74e6c177e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bgptools/pop.go
View File

@ -42,19 +42,16 @@ type PoPResult struct {
Result string Result string
} }
// retryConfig 重试配置
type retryConfig struct { type retryConfig struct {
maxRetries int maxRetries int
timeouts []time.Duration timeouts []time.Duration
} }
// 默认重试配置：3次重试，超时时间分别为3s、4s、5s
var defaultRetryConfig = retryConfig{ var defaultRetryConfig = retryConfig{
maxRetries: 2, maxRetries: 2,
timeouts: []time.Duration{5 * time.Second, 6 * time.Second}, timeouts: []time.Duration{5 * time.Second, 6 * time.Second},
} }
// executeWithRetry 执行带重试的HTTP请求
func executeWithRetry(client *req.Client, url string, config retryConfig) (*req.Response, error) { func executeWithRetry(client *req.Client, url string, config retryConfig) (*req.Response, error) {
var lastErr error var lastErr error
for attempt := 0; attempt < config.maxRetries; attempt++ { for attempt := 0; attempt < config.maxRetries; attempt++ {
@ -88,10 +85,12 @@ func getISPAbbr(asn, name string) string {
func getISPType(asn string, tier1 bool, direct bool) string { func getISPType(asn string, tier1 bool, direct bool) string {
switch { switch {
case tier1 && model.Tier1Global[asn] != "": case tier1 && direct && model.Tier1Global[asn] != "":
return "Tier1 Global" return "Tier1 Global"
case model.Tier1Regional[asn] != "": case tier1 && direct && model.Tier1Regional[asn] != "":
return "Tier1 Regional" return "Tier1 Regional"
case tier1 && !direct:
return "Tier1 Indirect"
case model.Tier2[asn] != "": case model.Tier2[asn] != "":
return "Tier2" return "Tier2"
case model.ContentProviders[asn] != "": case model.ContentProviders[asn] != "":
@ -343,7 +342,6 @@ func GetPoPInfo(ip string) (*PoPResult, error) {
if ip == "" { if ip == "" {
return nil, fmt.Errorf("IP address cannot be empty") return nil, fmt.Errorf("IP address cannot be empty")
} }
svgPath, err := getSVGPath(ip) svgPath, err := getSVGPath(ip)
if err != nil { if err != nil {
return nil, fmt.Errorf("获取SVG路径失败: %w", err) return nil, fmt.Errorf("获取SVG路径失败: %w", err)