unistack-org/micro-server-http
4
0
Fork 2
Code Issues 4 Pull Requests Packages Projects Releases 113 Wiki Activity

#153-v3 #187

Closed
kgorbunov wants to merge 3 commits from kgorbunov/micro-server-http:#153-v3 into v3
pull from: kgorbunov/micro-server-http:#153-v3
merge into: unistack-org:v3
Conversation 0 Commits 3 Files Changed 1 +2 -3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4a5762871e - Show all commits

5
handler/meter/meter.go
View File

@ -9,7 +9,6 @@ import (
"sync" "sync"
codecpb "go.unistack.org/micro-proto/v3/codec" codecpb "go.unistack.org/micro-proto/v3/codec"
"go.unistack.org/micro/v3/errors"
"go.unistack.org/micro/v3/logger" "go.unistack.org/micro/v3/logger"
"go.unistack.org/micro/v3/metadata" "go.unistack.org/micro/v3/metadata"
"go.unistack.org/micro/v3/meter" "go.unistack.org/micro/v3/meter"
@ -81,7 +80,7 @@ func NewHandler(opts ...Option) *Handler {
func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error { func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.Frame) error {
log, ok := logger.FromContext(ctx) log, ok := logger.FromContext(ctx)
if !ok { if !ok {
log = logger.DefaultLogger() log = logger.DefaultLogger
} }
buf := bufPool.Get().(*bytes.Buffer) buf := bufPool.Get().(*bytes.Buffer)
@ -104,7 +103,7 @@ func (h *Handler) Metrics(ctx context.Context, req *codecpb.Frame, rsp *codecpb.
} }
if err := h.opts.Meter.Write(w, h.opts.MeterOptions...); err != nil { if err := h.opts.Meter.Write(w, h.opts.MeterOptions...); err != nil {
log.Error(ctx, errors.InternalServerError(h.opts.Name, "%v", err)) log.Error(ctx, "http/meter: write failed", err)
return nil return nil
} }