chore: follow slog api change (#460)

woorui · web-flow · commit bf581b103e90 · 2023-02-28T11:47:36.000+08:00
diff --git a/core/ylog/example_test.go b/core/ylog/example_test.go
@@ -37,6 +37,6 @@ func Example() {
 
 	// Output:
 	// level=WARN msg=warn hello=yomo syslog.eee=fff
-	// level=ERROR msg=error hello=yomo syslog.eee=fff syslog.err=EOF
-	// {"level":"ERROR","msg":"sys error","syslog":{"ggg":"hhh","err":"use of closed network connection"}}
+	// level=ERROR msg=error hello=yomo syslog.err=EOF syslog.eee=fff
+	// {"level":"ERROR","msg":"sys error","syslog":{"err":"use of closed network connection","ggg":"hhh"}}
 }
diff --git a/core/ylog/logger_test.go b/core/ylog/logger_test.go
@@ -43,7 +43,7 @@ func TestLogger(t *testing.T) {
 
 	assert.NoError(t, err)
 	assert.FileExists(t, errOutput)
-	assert.Equal(t, "level=ERROR msg=error hello=yomo err=EOF\n", string(errlog))
+	assert.Equal(t, "level=ERROR msg=error err=EOF hello=yomo\n", string(errlog))
 
 	os.Remove(output)
 	os.Remove(errOutput)
diff --git a/core/ylog/slog_handler.go b/core/ylog/slog_handler.go
@@ -3,6 +3,7 @@ package ylog
 
 import (
 	"bytes"
+	"context"
 	"io"
 	"os"
 	"strings"
@@ -73,12 +74,12 @@ func NewHandlerFromConfig(conf Config) slog.Handler {
 	}
 }
 
-func (h *handler) Enabled(level slog.Level) bool {
-	return h.Handler.Enabled(level)
+func (h *handler) Enabled(ctx context.Context, level slog.Level) bool {
+	return h.Handler.Enabled(ctx, level)
 }
 
-func (h *handler) Handle(r slog.Record) error {
-	err := h.Handler.Handle(r)
+func (h *handler) Handle(ctx context.Context, r slog.Record) error {
+	err := h.Handler.Handle(ctx, r)
 	if err != nil {
 		return err
 	}
diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/spf13/viper v1.13.0
 	github.com/stretchr/testify v1.8.2
 	github.com/yomorun/y3 v1.0.5
-	golang.org/x/exp v0.0.0-20221212164502-fae10dda9338
+	golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2
 	golang.org/x/mod v0.8.0
 	golang.org/x/tools v0.6.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
diff --git a/go.sum b/go.sum
@@ -264,8 +264,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20221212164502-fae10dda9338 h1:OvjRkcNHnf6/W5FZXSxODbxwD+X7fspczG7Jn/xQVD4=
-golang.org/x/exp v0.0.0-20221212164502-fae10dda9338/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI=
+golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ func Example() {`
`37`	`37`
`38`	`38`	`// Output:`
`39`	`39`	`// level=WARN msg=warn hello=yomo syslog.eee=fff`
`40`		`- // level=ERROR msg=error hello=yomo syslog.eee=fff syslog.err=EOF`
`41`		`- // {"level":"ERROR","msg":"sys error","syslog":{"ggg":"hhh","err":"use of closed network connection"}}`
	`40`	`+ // level=ERROR msg=error hello=yomo syslog.err=EOF syslog.eee=fff`
	`41`	`+ // {"level":"ERROR","msg":"sys error","syslog":{"err":"use of closed network connection","ggg":"hhh"}}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package ylog`
`3`	`3`
`4`	`4`	`import (`
`5`	`5`	`"bytes"`
	`6`	`+ "context"`
`6`	`7`	`"io"`
`7`	`8`	`"os"`
`8`	`9`	`"strings"`
`@@ -73,12 +74,12 @@ func NewHandlerFromConfig(conf Config) slog.Handler {`
`73`	`74`	`}`
`74`	`75`	`}`
`75`	`76`
`76`		`-func (h *handler) Enabled(level slog.Level) bool {`
`77`		`- return h.Handler.Enabled(level)`
	`77`	`+func (h *handler) Enabled(ctx context.Context, level slog.Level) bool {`
	`78`	`+ return h.Handler.Enabled(ctx, level)`
`78`	`79`	`}`
`79`	`80`
`80`		`-func (h *handler) Handle(r slog.Record) error {`
`81`		`- err := h.Handler.Handle(r)`
	`81`	`+func (h *handler) Handle(ctx context.Context, r slog.Record) error {`
	`82`	`+ err := h.Handler.Handle(ctx, r)`
`82`	`83`	`if err != nil {`
`83`	`84`	`return err`
`84`	`85`	`}`