xfy/lolly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(config,test): 优化 parseSize 为 switch 并适配 NewProxyCache 签名

Browse Source 
将 parseSize 的 if-else 改为 switch 语句；更新集成测试中
NewProxyCache 调用以匹配新增的 stale_if_error/stale_if_timeout 参数。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
xfy 2026-04-24 10:41:56 +08:00
parent 1e38fe9e90
commit 0cf943fede
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/config/config.go
View File

@ -458,10 +458,11 @@ func parseSize(s string) (int, error) {
multiplier := 1
numStr := s
if unit == "k" {
switch unit {
case "k":
multiplier = 1024
numStr = s[:len(s)-1]
} else if unit == "m" {
case "m":
multiplier = 1024 * 1024
numStr = s[:len(s)-1]
}

18
internal/integration/cache_integration_test.go
View File

@ -27,7 +27,7 @@ func TestProxyCacheCreation(t *testing.T) {
},
}
pc := cache.NewProxyCache(rules, true, 30*time.Second)
pc := cache.NewProxyCache(rules, true, 30*time.Second, 0, 0)
require.NotNil(t, pc)
}
@ -35,7 +35,7 @@ func TestProxyCacheCreation(t *testing.T) {
func TestProxyCacheDisabled(t *testing.T) {
rules := []cache.ProxyCacheRule{}
pc := cache.NewProxyCache(rules, false, 0)
pc := cache.NewProxyCache(rules, false, 0, 0, 0)
require.NotNil(t, pc)
}
@ -50,7 +50,7 @@ func TestProxyCacheSetAndGet(t *testing.T) {
},
}
pc := cache.NewProxyCache(rules, true, 30*time.Second)
pc := cache.NewProxyCache(rules, true, 30*time.Second, 0, 0)
require.NotNil(t, pc)
origKey := "GET:/test"
@ -85,7 +85,7 @@ func TestProxyCacheMiss(t *testing.T) {
},
}
pc := cache.NewProxyCache(rules, true, 30*time.Second)
pc := cache.NewProxyCache(rules, true, 30*time.Second, 0, 0)
require.NotNil(t, pc)
origKey := "GET:/nonexistent"
@ -109,7 +109,7 @@ func TestProxyCacheExpiration(t *testing.T) {
},
}
pc := cache.NewProxyCache(rules, true, 50*time.Millisecond)
pc := cache.NewProxyCache(rules, true, 50*time.Millisecond, 0, 0)
require.NotNil(t, pc)
origKey := "GET:/expiring"
@ -146,7 +146,7 @@ func TestProxyCacheStale(t *testing.T) {
}
// staleTime = 200ms，允许过期后 200ms 内复用
pc := cache.NewProxyCache(rules, true, 200*time.Millisecond)
pc := cache.NewProxyCache(rules, true, 200*time.Millisecond, 0, 0)
require.NotNil(t, pc)
origKey := "GET:/stale"
@ -178,7 +178,7 @@ func TestProxyCacheHashKeyCollision(t *testing.T) {
},
}
pc := cache.NewProxyCache(rules, true, 30*time.Second)
pc := cache.NewProxyCache(rules, true, 30*time.Second, 0, 0)
require.NotNil(t, pc)
// 两个不同的 key
@ -213,7 +213,7 @@ func TestProxyCacheConcurrent(t *testing.T) {
},
}
pc := cache.NewProxyCache(rules, true, 30*time.Second)
pc := cache.NewProxyCache(rules, true, 30*time.Second, 0, 0)
require.NotNil(t, pc)
// 并发写入
@ -251,7 +251,7 @@ func TestProxyCacheUsesCount(t *testing.T) {
},
}
pc := cache.NewProxyCache(rules, true, 30*time.Second)
pc := cache.NewProxyCache(rules, true, 30*time.Second, 0, 0)
require.NotNil(t, pc)
origKey := "GET:/counted"