UNO-SOFT/zlog/v2/slog

converter/config.go

@@ -14,9 +14,9 @@ import (
 
 	"github.com/UNO-SOFT/filecache"
 	"github.com/UNO-SOFT/zlog/v2"
+	"github.com/UNO-SOFT/zlog/v2/slog"
 	config "github.com/stvp/go-toml-config"
 	"github.com/tgulacsi/go/osgroup"
-	"golang.org/x/exp/slog"
 )
 
 var logger *slog.Logger

converter/converter_test.go

@@ -13,8 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-logr/logr"
-	"github.com/go-logr/logr/testr"
+	"github.com/UNO-SOFT/zlog/v2"
 )
 
 func TestTextToHTML(t *testing.T) {
@@ -34,8 +33,9 @@ func TestTextToHTML(t *testing.T) {
 }
 
 func setTestLogger(t *testing.T) func() {
-	SetLogger(testr.New(t))
-	return func() { SetLogger(logr.Discard()) }
+	SetLogger(zlog.NewT(t).SLog())
+	//return func() { SetLogger(zlog.()) }
+	return func() {}
 }
 
 var testDir string

go.mod

@@ -2,9 +2,10 @@ module github.com/tgulacsi/agostle
 
 require (
 	bitbucket.org/zombiezen/gopdf v0.0.0-20190421151423-ab3d04824694
-	github.com/KarpelesLab/reflink v0.0.2
-	github.com/UNO-SOFT/filecache v0.1.5
+	github.com/KarpelesLab/reflink v1.0.1
+	github.com/UNO-SOFT/filecache v0.1.6
 	github.com/UNO-SOFT/otel v0.5.1
+	github.com/UNO-SOFT/zlog v0.7.3
 	github.com/VictoriaMetrics/metrics v1.24.0
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/gabriel-vasile/mimetype v1.4.2
@@ -18,22 +19,22 @@ require (
 	github.com/kylelemons/godebug v1.1.0
 	github.com/mholt/archiver/v4 v4.0.0-alpha.8
 	github.com/oklog/ulid/v2 v2.1.0
-	github.com/peterbourgon/ff/v3 v3.3.1
+	github.com/peterbourgon/ff/v3 v3.4.0
 	github.com/rs/zerolog v1.29.1
 	github.com/stvp/go-toml-config v0.0.0-20220807175811-1347a3c4169c
-	github.com/tgulacsi/go v0.24.5
-	github.com/theupdateframework/go-tuf v0.5.2
-	golang.org/x/image v0.7.0
-	golang.org/x/net v0.10.0
-	golang.org/x/sync v0.2.0
-	golang.org/x/text v0.9.0
+	github.com/tgulacsi/go v0.25.1
+	github.com/theupdateframework/go-tuf v0.6.1
+	golang.org/x/exp v0.0.0-20230810033253-352e893a4cad
+	golang.org/x/image v0.11.0
+	golang.org/x/net v0.14.0
+	golang.org/x/sync v0.3.0
+	golang.org/x/text v0.12.0
 )
 
 require (
-	github.com/UNO-SOFT/zlog v0.6.3 // indirect
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/bodgit/plumbing v1.3.0 // indirect
-	github.com/bodgit/sevenzip v1.4.2 // indirect
+	github.com/bodgit/sevenzip v1.4.3 // indirect
 	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/connesc/cipherio v0.2.1 // indirect
 	github.com/dgryski/go-linebreak v0.0.0-20180812204043-d8f37254e7d3 // indirect
@@ -47,19 +48,19 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/hhrutter/lzw v1.0.0 // indirect
 	github.com/hhrutter/tiff v1.0.0 // indirect
-	github.com/klauspost/compress v1.16.5 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
-	github.com/pdfcpu/pdfcpu v0.4.1 // indirect
+	github.com/pdfcpu/pdfcpu v0.4.2 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	github.com/secure-systems-lab/go-securesystemslib v0.6.0 // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
 	github.com/sloonz/go-qprintable v0.0.0-20210417175225-715103f9e6eb // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
 	github.com/ulikunitz/xz v0.5.11 // indirect
@@ -73,13 +74,14 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
 	go.opentelemetry.io/otel/trace v1.16.0 // indirect
 	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/term v0.11.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
-go 1.20
+go 1.21
+
+toolchain go1.21.0
 
 //replace github.com/UNO-SOFT/filecache => ../../UNO-SOFT/filecache