timamsk/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2026-04-13 20:28:32 +10:00
Code Issues Packages Projects Releases Wiki Activity

ccm,ocm: fix reserveWeekly default and remove dead reserve fields

Browse Source
This commit is contained in:
世界
2026-03-13 23:29:06 +08:00
parent 566abb00cd
commit 8cd7713ca9
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/ccm/credential_state.go
View File

@@ -87,8 +87,6 @@ type defaultCredential struct {
pollAccess sync.Mutex
reloadAccess sync.Mutex
watcherAccess sync.Mutex
reserve5h uint8
reserveWeekly uint8
cap5h float64
capWeekly float64
usageTracker *AggregatedUsage
@@ -182,7 +180,7 @@ func newDefaultCredential(ctx context.Context, tag string, options option.CCMDef
}
reserveWeekly := options.ReserveWeekly
if reserveWeekly == 0 {
reserveWeekly = 10
reserveWeekly = 1
}
var cap5h float64
if options.Limit5h > 0 {
@@ -201,8 +199,6 @@ func newDefaultCredential(ctx context.Context, tag string, options option.CCMDef
tag: tag,
serviceContext: ctx,
credentialPath: options.CredentialPath,
reserve5h: reserve5h,
reserveWeekly: reserveWeekly,
cap5h: cap5h,
capWeekly: capWeekly,
httpClient: httpClient,

6
service/ocm/credential_state.go
View File

@@ -87,8 +87,6 @@ type defaultCredential struct {
pollAccess sync.Mutex
reloadAccess sync.Mutex
watcherAccess sync.Mutex
reserve5h uint8
reserveWeekly uint8
cap5h float64
capWeekly float64
usageTracker *AggregatedUsage
@@ -190,7 +188,7 @@ func newDefaultCredential(ctx context.Context, tag string, options option.OCMDef
}
reserveWeekly := options.ReserveWeekly
if reserveWeekly == 0 {
reserveWeekly = 10
reserveWeekly = 1
}
var cap5h float64
if options.Limit5h > 0 {
@@ -209,8 +207,6 @@ func newDefaultCredential(ctx context.Context, tag string, options option.OCMDef
tag: tag,
serviceContext: ctx,
credentialPath: options.CredentialPath,
reserve5h: reserve5h,
reserveWeekly: reserveWeekly,
cap5h: cap5h,
capWeekly: capWeekly,
dialer: credentialDialer,