unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 324 Wiki Activity

modify all code for never logger interface

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2021-01-10 19:24:03 +03:00
parent 7b3a7a9448
commit 8b7380876e
16 changed files with 82 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util/router/parse.go
View File

@@ -3,6 +3,7 @@ package router
// download from https://raw.githubusercontent.com/grpc-ecosystem/grpc-gateway/master/protoc-gen-grpc-gateway/httprule/parse.go
import (
"context"
"fmt"
"strings"
@@ -103,20 +104,20 @@ type parser struct {
// topLevelSegments is the target of this parser.
func (p *parser) topLevelSegments() ([]segment, error) {
if logger.V(logger.TraceLevel) {
logger.Debug("Parsing %q", p.tokens)
logger.Debug(context.TODO(), "Parsing %q", p.tokens)
}
segs, err := p.segments()
if err != nil {
return nil, err
}
if logger.V(logger.TraceLevel) {
logger.Trace("accept segments: %q; %q", p.accepted, p.tokens)
logger.Trace(context.TODO(), "accept segments: %q; %q", p.accepted, p.tokens)
}
if _, err := p.accept(typeEOF); err != nil {
return nil, fmt.Errorf("unexpected token %q after segments %q", p.tokens[0], strings.Join(p.accepted, ""))
}
if logger.V(logger.TraceLevel) {
logger.Trace("accept eof: %q; %q", p.accepted, p.tokens)
logger.Trace(context.TODO(), "accept eof: %q; %q", p.accepted, p.tokens)
}
return segs, nil
}
@@ -128,7 +129,7 @@ func (p *parser) segments() ([]segment, error) {
}
if logger.V(logger.TraceLevel) {
logger.Trace("accept segment: %q; %q", p.accepted, p.tokens)
logger.Trace(context.TODO(), "accept segment: %q; %q", p.accepted, p.tokens)
}
segs := []segment{s}
for {
@@ -141,7 +142,7 @@ func (p *parser) segments() ([]segment, error) {
}
segs = append(segs, s)
if logger.V(logger.TraceLevel) {
logger.Trace("accept segment: %q; %q", p.accepted, p.tokens)
logger.Trace(context.TODO(), "accept segment: %q; %q", p.accepted, p.tokens)
}
}
}