Skip to content

Commit d9d2052

Browse files
sentrizsentriz
committed
chore(deps): bump
1 parent 300ab36 commit d9d2052

File tree

3 files changed

+34
-27
lines changed

3 files changed

+34
-27
lines changed

‎cmd/wrtagweb/main.go‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import (
1515
"io"
1616
"log/slog"
1717
"math"
18+
"net"
1819
"net/http"
1920
"net/http/pprof"
2021
"net/url"
@@ -109,13 +110,14 @@ func main() {
109110
}
110111
defer db.Close()
111112

113+
ctx := context.Background()
112114
if lev := slog.LevelDebug; slog.Default().Enabled(context.Background(), lev) {
113-
sqlb.SetLog(func(ctx context.Context, typ string, duration time.Duration, query string) {
115+
ctx = sqlb.WithLogFunc(ctx, func(ctx context.Context, typ string, query string, duration time.Duration) {
114116
slog.Log(ctx, lev, typ, "took", duration, "query", query)
115117
})
116118
}
117119

118-
if err := dbMigrate(context.Background(), db); err != nil {
120+
if err := dbMigrate(ctx, db); err != nil {
119121
slog.Error("migrate db", "err", err)
120122
return
121123
}
@@ -326,7 +328,7 @@ func main() {
326328
mux.HandleFunc("GET /debug/pprof/symbol", pprof.Symbol)
327329
mux.HandleFunc("GET /debug/pprof/trace", pprof.Trace)
328330

329-
ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
331+
ctx, cancel := signal.NotifyContext(ctx, os.Interrupt, syscall.SIGTERM)
330332
defer cancel()
331333
errgrp, ctx := errgroup.WithContext(ctx)
332334

@@ -338,7 +340,12 @@ func main() {
338340
h = authMiddleware(h, *apiKey)
339341
h = logMiddleware(h)
340342

341-
server := &http.Server{Addr: *listenAddr, Handler: h, ReadHeaderTimeout: 2 * time.Second}
343+
server := &http.Server{
344+
Addr: *listenAddr,
345+
Handler: h,
346+
ReadHeaderTimeout: 2 * time.Second,
347+
BaseContext: func(l net.Listener) context.Context { return ctx },
348+
}
342349

343350
errgrp.Go(func() error {
344351
<-ctx.Done()
@@ -376,7 +383,7 @@ func main() {
376383

377384
// restart old jobs just in case the process was killed abruptly last time
378385
errgrp.Go(func() error {
379-
for job, err := range sqlb.Iter[Job](ctx, db, "update jobs set status=? where status=? returning *", StatusEnqueued, StatusInProgress) {
386+
for job, err := range sqlb.IterRows[Job](ctx, db, "update jobs set status=? where status=? returning *", StatusEnqueued, StatusInProgress) {
380387
if err != nil {
381388
return fmt.Errorf("iter old jobs: %w", err)
382389
}
@@ -533,7 +540,7 @@ func listJobs(ctx context.Context, db *sql.DB, status JobStatus, search string,
533540
}
534541

535542
var jobs []*Job
536-
if err := sqlb.ScanPtr(ctx, db, &jobs, "select * from jobs where ? order by time desc limit ? offset ?", cond, pageSize, pageSize*page); err != nil {
543+
if err := sqlb.ScanRows(ctx, db, sqlb.AppendPtr(&jobs), "select * from jobs where ? order by time desc limit ? offset ?", cond, pageSize, pageSize*page); err != nil {
537544
return jobsListing{}, fmt.Errorf("list jobs: %w", err)
538545
}
539546

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ require (
88
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
99
github.com/argusdusty/treelock v0.0.0-20180405040243-bde644eb4b53
1010
github.com/containrrr/shoutrrr v0.8.0
11-
github.com/goccy/go-yaml v1.18.0
11+
github.com/goccy/go-yaml v1.19.0
1212
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
1313
github.com/gosimple/unidecode v1.0.1
1414
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
15-
github.com/ncruces/go-sqlite3 v0.30.1
15+
github.com/ncruces/go-sqlite3 v0.30.2
1616
github.com/rogpeppe/go-internal v1.14.1
1717
github.com/sergi/go-diff v1.4.0
1818
github.com/stretchr/testify v1.11.1
19-
go.senan.xyz/flagconf v0.1.9
19+
go.senan.xyz/flagconf v0.1.10
2020
go.senan.xyz/natcmp v0.1.2
21-
go.senan.xyz/sqlb v0.2.7
21+
go.senan.xyz/sqlb v0.3.0
2222
go.senan.xyz/table v0.0.0-20251023151529-96acc7f0ad6c
2323
go.senan.xyz/taglib v0.11.1
24-
golang.org/x/net v0.46.0
24+
golang.org/x/net v0.47.0
2525
golang.org/x/sync v0.18.0
26-
golang.org/x/text v0.30.0
26+
golang.org/x/text v0.31.0
2727
golang.org/x/time v0.14.0
2828
)
2929

@@ -38,7 +38,7 @@ require (
3838
github.com/rivo/uniseg v0.4.7 // indirect
3939
github.com/tetratelabs/wazero v1.10.1 // indirect
4040
golang.org/x/sys v0.38.0 // indirect
41-
golang.org/x/tools v0.38.0 // indirect
41+
golang.org/x/tools v0.39.0 // indirect
4242
gopkg.in/yaml.v3 v3.0.1 // indirect
4343
)
4444

‎go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
2020
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
2121
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
2222
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
23-
github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
24-
github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
23+
github.com/goccy/go-yaml v1.19.0 h1:EmkZ9RIsX+Uq4DYFowegAuJo8+xdX3T/2dwNPXbxEYE=
24+
github.com/goccy/go-yaml v1.19.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
2525
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
2626
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
2727
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -47,8 +47,8 @@ github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stg
4747
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
4848
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
4949
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
50-
github.com/ncruces/go-sqlite3 v0.30.1 h1:pHC3YsyRdJv4pCMB4MO1Q2BXw/CAa+Hoj7GSaKtVk+g=
51-
github.com/ncruces/go-sqlite3 v0.30.1/go.mod h1:UVsWrQaq1qkcal5/vT5lOJnZCVlR5rsThKdwidjFsKc=
50+
github.com/ncruces/go-sqlite3 v0.30.2 h1:1GVbHAkKAOwjJd3JYl8ldrYROudfZUOah7oXPD7VZbQ=
51+
github.com/ncruces/go-sqlite3 v0.30.2/go.mod h1:AxKu9sRxkludimFocbktlY6LiYSkxiI5gTA8r+os/Nw=
5252
github.com/ncruces/julianday v1.0.0 h1:fH0OKwa7NWvniGQtxdJRxAgkBMolni2BjDHaWTxqt7M=
5353
github.com/ncruces/julianday v1.0.0/go.mod h1:Dusn2KvZrrovOMJuOt0TNXL6tB7U2E8kvza5fFc9G7g=
5454
github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
@@ -73,12 +73,12 @@ github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD
7373
github.com/tetratelabs/wazero v1.10.1 h1:2DugeJf6VVk58KTPszlNfeeN8AhhpwcZqkJj2wwFuH8=
7474
github.com/tetratelabs/wazero v1.10.1/go.mod h1:DRm5twOQ5Gr1AoEdSi0CLjDQF1J9ZAuyqFIjl1KKfQU=
7575
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
76-
go.senan.xyz/flagconf v0.1.9 h1:LBDmqiVFgijfqFXDzH97gPn0qDbg1Dq6/vxsxS/TzC4=
77-
go.senan.xyz/flagconf v0.1.9/go.mod h1:NqOFfSwJvNWXOTUabcRZ8mPK9+sJmhStJhqtEt74wNQ=
76+
go.senan.xyz/flagconf v0.1.10 h1:IGWaX9z4uh03xopYJSwpw1u0KrwRWs8vDmFjaULFH3U=
77+
go.senan.xyz/flagconf v0.1.10/go.mod h1:NqOFfSwJvNWXOTUabcRZ8mPK9+sJmhStJhqtEt74wNQ=
7878
go.senan.xyz/natcmp v0.1.2 h1:ko7umA435ZyrNtNZeAvBOWzxct9RaXdie7XC1rWhD84=
7979
go.senan.xyz/natcmp v0.1.2/go.mod h1:OuIIjIsyj2PwVqCtfzqTeplsZhSXGjm4okZei78Bck4=
80-
go.senan.xyz/sqlb v0.2.7 h1:CZwkuycQvqVZVxzy/+IvW6cOpVWJjZ53YnckICILjzk=
81-
go.senan.xyz/sqlb v0.2.7/go.mod h1:WR1FBAYs4MZHBomltX7FslGUWdHZQJEO4H6t3qd0ZA0=
80+
go.senan.xyz/sqlb v0.3.0 h1:0yiFj9fRqMOHe27636B/4yYNxSuAzyzTjkySGIiUJus=
81+
go.senan.xyz/sqlb v0.3.0/go.mod h1:WR1FBAYs4MZHBomltX7FslGUWdHZQJEO4H6t3qd0ZA0=
8282
go.senan.xyz/table v0.0.0-20251023151529-96acc7f0ad6c h1:bFAaOE0JyfVSXywJNsYAUrO+YWsgRrh7/UPAiQKUIes=
8383
go.senan.xyz/table v0.0.0-20251023151529-96acc7f0ad6c/go.mod h1:FKya72hx1CWsohl2mArYink1gVpJpku1WtyK5wRn2qY=
8484
go.senan.xyz/taglib v0.11.1 h1:S3mO5e3HRRG0Ehw1jLUodYbAJK8TtqdOoNgqkC0D3uU=
@@ -103,8 +103,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
103103
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
104104
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
105105
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
106-
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
107-
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
106+
golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
107+
golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
108108
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
109109
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
110110
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -146,8 +146,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
146146
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
147147
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
148148
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
149-
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
150-
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
149+
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
150+
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
151151
golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI=
152152
golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4=
153153
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -156,8 +156,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
156156
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
157157
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
158158
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
159-
golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
160-
golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
159+
golang.org/x/tools v0.39.0 h1:ik4ho21kwuQln40uelmciQPp9SipgNDdrafrYA4TmQQ=
160+
golang.org/x/tools v0.39.0/go.mod h1:JnefbkDPyD8UU2kI5fuf8ZX4/yUeh9W877ZeBONxUqQ=
161161
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
162162
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
163163
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

0 commit comments

Comments
 (0)