Skip to content

Commit 0f35a80

Browse files
committed
go.mod: update mds to v0.19.3 and update cache usage
1 parent 625e724 commit 0f35a80

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/creachadair/command v0.1.15
1212
github.com/creachadair/flax v0.0.1
1313
github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112
14-
github.com/creachadair/mds v0.19.2
14+
github.com/creachadair/mds v0.19.3
1515
github.com/creachadair/mhttp v0.0.0-20240907154916-d408c0542750
1616
github.com/creachadair/scheddle v0.0.0-20240908173745-88f3b31b6673
1717
github.com/creachadair/taskgroup v0.9.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ github.com/creachadair/flax v0.0.1 h1:it+joEf9aEUalaV7XWll/pk6zA4/FbNvMImW9q/lS8
4848
github.com/creachadair/flax v0.0.1/go.mod h1:K8bFvn8hMdAljQkaKNc7I3os5Wk36JxkyCkfdZ7S8d4=
4949
github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112 h1:FSlFO2eztBGGzp67D2z/eeNe5U+AZyj4g/CjKf0AHbo=
5050
github.com/creachadair/gocache v0.0.0-20240904225701-6c4617815112/go.mod h1:vkGW73GdzBPQZJdFlPBZVzFcG7lTxIgDY0+U30mp3xs=
51-
github.com/creachadair/mds v0.19.2 h1:I5OdjsrG2jqGklMcyv50Iqo6gTrwUSIpIJVSnlVw85c=
52-
github.com/creachadair/mds v0.19.2/go.mod h1:4b//mUiL8YldH6TImXjmW45myzTLNS1LLjOmrk888eg=
51+
github.com/creachadair/mds v0.19.3 h1:qBkZ5d8SNtJZXQTYs7tYqEIwCD6ifchNTIjhYRThLNw=
52+
github.com/creachadair/mds v0.19.3/go.mod h1:4b//mUiL8YldH6TImXjmW45myzTLNS1LLjOmrk888eg=
5353
github.com/creachadair/mhttp v0.0.0-20240907154916-d408c0542750 h1:fJzQV75gKAfx1Od7EiQI9rn0wTvO7Uc/YgQW54y77dQ=
5454
github.com/creachadair/mhttp v0.0.0-20240907154916-d408c0542750/go.mod h1:WDSdP3YUQE4YJNxq77RUCZRIvh1l2o8y58bbHsBffo4=
5555
github.com/creachadair/msync v0.3.0 h1:7FoPzwrM4gAdfsj7mcVyodKV82fArJaKcgr9j9whYww=

lib/revproxy/cache.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,3 +155,5 @@ type memCacheEntry struct {
155155
header http.Header
156156
body []byte
157157
}
158+
159+
func entrySize(e memCacheEntry) int64 { return int64(len(e.body)) }

lib/revproxy/revproxy.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,9 @@ func (s *Server) init() {
114114
s.initOnce.Do(func() {
115115
nt := runtime.NumCPU()
116116
s.tasks, s.start = taskgroup.New(nil).Limit(nt)
117-
s.mcache = cache.New(cache.Config[string, memCacheEntry]{
118-
Limit: 10 << 20,
119-
Store: cache.LRU[string, memCacheEntry](),
120-
Size: func(e memCacheEntry) int64 {
121-
return int64(len(e.body))
122-
},
123-
})
117+
s.mcache = cache.New(10<<20, cache.LRU[string, memCacheEntry]().
118+
WithSize(entrySize),
119+
)
124120
s.expire = scheddle.NewQueue(nil)
125121
})
126122
}

0 commit comments

Comments
 (0)