Skip to content

Commit 7df652a

Browse files
committed
go.mod: update taskgroup to v0.13.1, update usage
1 parent a526a4a commit 7df652a

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

cmd/go-cache-plugin/commands.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ func runServe(env *command.Env) error {
9494
defer cancel()
9595

9696
var g taskgroup.Group
97-
g.Go(taskgroup.NoError(func() {
97+
g.Run(func() {
9898
<-ctx.Done()
9999
log.Printf("closing plugin listener")
100100
lst.Close()
101-
}))
101+
})
102102

103103
// If a module proxy is enabled, start it.
104104
modProxy, modCleanup, err := initModProxy(env.SetContext(ctx), s3c)
@@ -124,11 +124,11 @@ func runServe(env *command.Env) error {
124124
}
125125
g.Go(srv.ListenAndServe)
126126
vprintf("HTTP server listening at %q", serveFlags.HTTP)
127-
g.Go(taskgroup.NoError(func() {
127+
g.Run(func() {
128128
<-ctx.Done()
129129
vprintf("stopping HTTP service")
130130
srv.Shutdown(context.Background())
131-
}))
131+
})
132132
}
133133

134134
for {

cmd/go-cache-plugin/setup.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,11 @@ func initRevProxy(env *command.Env, s3c *s3util.Client, g *taskgroup.Group) (htt
215215
}
216216
g.Go(func() error { return psrv.ServeTLS(bridge, "", "") })
217217

218-
g.Go(taskgroup.NoError(func() {
218+
g.Run(func() {
219219
<-env.Context().Done()
220220
vprintf("stopping proxy bridge")
221221
psrv.Shutdown(context.Background())
222-
}))
222+
})
223223

224224
expvar.Publish("revcache", proxy.Metrics())
225225
vprintf("enabling reverse proxy for %s", strings.Join(proxy.Targets, ", "))

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/creachadair/mds v0.21.4
1515
github.com/creachadair/mhttp v0.0.0-20240908014720-a77225a19b8b
1616
github.com/creachadair/scheddle v0.0.0-20240919010233-b6854e09d972
17-
github.com/creachadair/taskgroup v0.13.0
17+
github.com/creachadair/taskgroup v0.13.1
1818
github.com/creachadair/tlsutil v0.0.0-20240907154432-0ca1e46ff43d
1919
github.com/goproxy/goproxy v0.17.2
2020
golang.org/x/sync v0.8.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ github.com/creachadair/msync v0.3.0 h1:7FoPzwrM4gAdfsj7mcVyodKV82fArJaKcgr9j9whY
5656
github.com/creachadair/msync v0.3.0/go.mod h1:XjAfMt+upDhbx3FeGJ1zkqQIm55E9xw/pWzITwVaIoI=
5757
github.com/creachadair/scheddle v0.0.0-20240919010233-b6854e09d972 h1:bWA80ILWcqGxveRewDQwf4nRF8E90SiCxqVo0DaOFxg=
5858
github.com/creachadair/scheddle v0.0.0-20240919010233-b6854e09d972/go.mod h1:PwCiUu3BYgSeOurdoA/+kDA5X39Z9JXRKDGUpkeKPCY=
59-
github.com/creachadair/taskgroup v0.13.0 h1:VKaW1fi1/Erkkrvx4NvaddzHCGA+hh5QPc5Veiq+joI=
60-
github.com/creachadair/taskgroup v0.13.0/go.mod h1:9oDDPt/5QPS4iylvPMC81GRlj+1je8AFDbjUh4zaQWo=
59+
github.com/creachadair/taskgroup v0.13.1 h1:OMDSdQV+OCr7uyS322cBlC2X3YPGec6wWAhAaNoSQwg=
60+
github.com/creachadair/taskgroup v0.13.1/go.mod h1:i3V1Zx7H8RjwljUEeUWYT30Lmb9poewSb2XI1yTwD0g=
6161
github.com/creachadair/tlsutil v0.0.0-20240907154432-0ca1e46ff43d h1:euNk+jFY3ytIBBMtXY80gbMK0pA4bXTYHbkxwEUgnKU=
6262
github.com/creachadair/tlsutil v0.0.0-20240907154432-0ca1e46ff43d/go.mod h1:QMYeSCtv6WYPxroqKtL1/5p4vG2SdWiBYiTxo4y0FMc=
6363
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=

0 commit comments

Comments
 (0)