go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-03-17 21:07:54 +02:00
Code Issues Releases Activity

mw/log: http code 0 (#1010)

Browse Source 
* fix middleware/log default code
This commit is contained in:
miya 2021-06-06 23:38:57 -05:00 committed by GitHub
parent 5cbda8ebd7
commit 544e08f729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 95 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
errors/errors.go
View File

@ -76,7 +76,7 @@ func Errorf(code int, reason, format string, a ...interface{}) error {
// It supports wrapped errors.
func Code(err error) int {
if err == nil {
return 0
return 200
}
if se := FromError(err); err != nil {
return int(se.Code)

14
middleware/logging/grpc.go
View File

@ -3,6 +3,8 @@ package logging
import (
"context"
"github.com/go-kratos/kratos/v2/errors"
"github.com/go-kratos/kratos/v2/internal/httputil"
"github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/transport/grpc"
)
@ -12,18 +14,19 @@ func grpcServerLog(logger log.Logger, ctx context.Context, args string, err erro
if !ok {
return
}
code, errMsg := extractError(err)
level := log.LevelInfo
if err != nil {
level = log.LevelError
}
log.WithContext(ctx, logger).Log(level,
"kind", "server",
"component", "grpc",
"grpc.target", info.FullMethod,
"grpc.args", args,
"grpc.code", code,
"grpc.error", errMsg,
"grpc.code", httputil.GRPCCodeFromStatus(errors.Code(err)),
"grpc.error", extractError(err),
)
}
@ -32,7 +35,6 @@ func grpcClientLog(logger log.Logger, ctx context.Context, args string, err erro
if !ok {
return
}
code, errMsg := extractError(err)
level := log.LevelInfo
if err != nil {
level = log.LevelError
@ -42,7 +44,7 @@ func grpcClientLog(logger log.Logger, ctx context.Context, args string, err erro
"component", "grpc",
"grpc.target", info.FullMethod,
"grpc.args", args,
"grpc.code", code,
"grpc.error", errMsg,
"grpc.code", httputil.GRPCCodeFromStatus(errors.Code(err)),
"grpc.error", extractError(err),
)
}

15
middleware/logging/http.go
View File

@ -3,6 +3,7 @@ package logging
import (
"context"
"github.com/go-kratos/kratos/v2/errors"
"github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/transport/http"
)
@ -12,19 +13,20 @@ func httpServerLog(logger log.Logger, ctx context.Context, args string, err erro
if !ok {
return
}
code, errMsg := extractError(err)
level := log.LevelInfo
if err != nil {
level = log.LevelError
}
log.WithContext(ctx, logger).Log(level,
"kind", "server",
"component", "http",
"http.target", info.Request.RequestURI,
"http.method", info.Request.Method,
"http.args", args,
"http.code", code,
"http.error", errMsg,
"http.code", errors.Code(err),
"http.error", extractError(err),
)
}
@ -33,18 +35,19 @@ func httpClientLog(logger log.Logger, ctx context.Context, args string, err erro
if !ok {
return
}
code, errMsg := extractError(err)
level := log.LevelInfo
if err != nil {
level = log.LevelError
}
log.WithContext(ctx, logger).Log(level,
"kind", "client",
"component", "http",
"http.target", info.Request.RequestURI,
"http.method", info.Request.Method,
"http.args", args,
"http.code", code,
"http.error", errMsg,
"http.code", errors.Code(err),
"http.error", extractError(err),
)
}

4
middleware/logging/logging.go
View File

@ -4,7 +4,6 @@ import (
"context"
"fmt"
"github.com/go-kratos/kratos/v2/errors"
"github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/middleware"
"github.com/go-kratos/kratos/v2/transport"
@ -53,9 +52,8 @@ func extractArgs(req interface{}) string {
return fmt.Sprintf("%+v", req)
}
func extractError(err error) (code int, errMsg string) {
func extractError(err error) (errMsg string) {
if err != nil {
code = errors.Code(err)
errMsg = fmt.Sprintf("%+v", err)
}
return

76
middleware/logging/logging_test.go Normal file
View File

@ -0,0 +1,76 @@
package logging
import (
"bytes"
"context"
"errors"
"net/http/httptest"
"testing"
"github.com/go-kratos/kratos/v2/log"
"github.com/go-kratos/kratos/v2/middleware"
"github.com/go-kratos/kratos/v2/transport"
"github.com/go-kratos/kratos/v2/transport/http"
)
func TestHTTP(t *testing.T) {
var req = httptest.NewRequest("GET", "http://example.com/foo", nil)
var err = errors.New("reply.error")
var bf = bytes.NewBuffer(nil)
var logger = log.NewStdLogger(bf)
tests := []struct {
name string
kind func(logger log.Logger) middleware.Middleware
err error
ctx context.Context
}{
{"http-server@fail",
Server,
err,
func() context.Context {
res := httptest.NewRecorder()
ctx := transport.NewContext(context.Background(), transport.Transport{Kind: transport.KindHTTP, Endpoint: "endpoint"})
return http.NewServerContext(ctx, http.ServerInfo{Request: req, Response: res})
}(),
},
{"http-server@succ",
Server,
nil,
func() context.Context {
res := httptest.NewRecorder()
ctx := transport.NewContext(context.Background(), transport.Transport{Kind: transport.KindHTTP, Endpoint: "endpoint"})
return http.NewServerContext(ctx, http.ServerInfo{Request: req, Response: res})
}(),
},
{"http-client@succ",
Client,
nil,
func() context.Context {
ctx := transport.NewContext(context.Background(), transport.Transport{Kind: transport.KindHTTP, Endpoint: "endpoint"})
return http.NewClientContext(ctx, http.ClientInfo{Request: req, PathPattern: "{name}"})
}(),
},
{"http-client@fail",
Client,
err,
func() context.Context {
ctx := transport.NewContext(context.Background(), transport.Transport{Kind: transport.KindHTTP, Endpoint: "endpoint"})
return http.NewClientContext(ctx, http.ClientInfo{Request: req, PathPattern: "{name}"})
}(),
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
bf.Reset()
next := func(ctx context.Context, req interface{}) (interface{}, error) {
return "reply", test.err
}
next = test.kind(logger)(next)
v, e := next(test.ctx, "req.args")
t.Logf("[%s]reply: %v, error: %v", test.name, v, e)
t.Logf("[%s]buffer:%s", test.name, bf.String())
})
}
}