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

rewrite logger

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов
2020-11-04 00:38:12 +03:00
parent 7c311aea19
commit e41bb5ebc5
26 changed files with 235 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/auth/auth.go
View File

@@ -26,7 +26,7 @@ func Verify(a auth.Auth) error {
return err
}
if logger.V(logger.DebugLevel) {
logger.Debugf("Auth [%v] Generated an auth account", a.String())
logger.Debug("Auth [%v] Generated an auth account: %s", a.String())
}
accID = acc.ID
@@ -68,7 +68,7 @@ func Verify(a auth.Auth) error {
)
if err != nil {
if logger.V(logger.WarnLevel) {
logger.Warnf("[Auth] Error refreshing token: %v", err)
logger.Warn("[Auth] Error refreshing token: %v", err)
}
continue
}

2
util/kubernetes/api/request.go
View File

@@ -219,7 +219,7 @@ func (r *Request) Do() *Response {
}
}
logger.Debugf("[Kubernetes] %v %v", req.Method, req.URL.String())
logger.Debug("[Kubernetes] %v %v", req.Method, req.URL.String())
res, err := r.client.Do(req)
if err != nil {
return &Response{

12
util/kubernetes/client/client.go
View File

@@ -228,7 +228,7 @@ func (c *client) Watch(r *Resource, opts ...WatchOption) (Watcher, error) {
// NewService returns default micro kubernetes service definition
func NewService(name, version, typ, namespace string) *Service {
if logger.V(logger.TraceLevel) {
logger.Tracef("kubernetes default service: name: %s, version: %s", name, version)
logger.Trace("kubernetes default service: name: %s, version: %s", name, version)
}
Labels := map[string]string{
@@ -271,7 +271,7 @@ func NewService(name, version, typ, namespace string) *Service {
// NewService returns default micro kubernetes deployment definition
func NewDeployment(name, version, typ, namespace string) *Deployment {
if logger.V(logger.TraceLevel) {
logger.Tracef("kubernetes default deployment: name: %s, version: %s", name, version)
logger.Trace("kubernetes default deployment: name: %s, version: %s", name, version)
}
Labels := map[string]string{
@@ -363,21 +363,21 @@ func NewClusterClient() *client {
s, err := os.Stat(serviceAccountPath)
if err != nil {
logger.Fatal(err)
logger.Fatal(err.Error())
}
if s == nil || !s.IsDir() {
logger.Fatal(errors.New("service account not found"))
logger.Fatal("service account not found")
}
token, err := ioutil.ReadFile(path.Join(serviceAccountPath, "token"))
if err != nil {
logger.Fatal(err)
logger.Fatal(err.Error())
}
t := string(token)
crt, err := CertPoolFromFile(path.Join(serviceAccountPath, "ca.crt"))
if err != nil {
logger.Fatal(err)
logger.Fatal(err.Error())
}
c := &http.Client{

10
util/mdns/server.go
View File

@@ -9,7 +9,7 @@ import (
"time"
"github.com/miekg/dns"
log "github.com/unistack-org/micro/v3/logger"
"github.com/unistack-org/micro/v3/logger"
"golang.org/x/net/ipv4"
"golang.org/x/net/ipv6"
)
@@ -196,7 +196,7 @@ func (s *Server) recv(c *net.UDPConn) {
continue
}
if err := s.parsePacket(buf[:n], from); err != nil {
log.Errorf("[ERR] mdns: Failed to handle query: %v", err)
logger.Error("[ERR] mdns: Failed to handle query: %v", err)
}
}
}
@@ -205,7 +205,7 @@ func (s *Server) recv(c *net.UDPConn) {
func (s *Server) parsePacket(packet []byte, from net.Addr) error {
var msg dns.Msg
if err := msg.Unpack(packet); err != nil {
log.Errorf("[ERR] mdns: Failed to unpack packet: %v", err)
logger.Error("[ERR] mdns: Failed to unpack packet: %v", err)
return err
}
// TODO: This is a bit of a hack
@@ -384,7 +384,7 @@ func (s *Server) probe() {
for i := 0; i < 3; i++ {
if err := s.SendMulticast(q); err != nil {
log.Errorf("[ERR] mdns: failed to send probe:", err.Error())
logger.Error("[ERR] mdns: failed to send probe: %v", err)
}
time.Sleep(time.Duration(randomizer.Intn(250)) * time.Millisecond)
}
@@ -410,7 +410,7 @@ func (s *Server) probe() {
timer := time.NewTimer(timeout)
for i := 0; i < 3; i++ {
if err := s.SendMulticast(resp); err != nil {
log.Errorf("[ERR] mdns: failed to send announcement:", err.Error())
logger.Error("[ERR] mdns: failed to send announcement:", err.Error())
}
select {
case <-timer.C:

10
util/router/parse.go
View File

@@ -103,20 +103,20 @@ type parser struct {
// topLevelSegments is the target of this parser.
func (p *parser) topLevelSegments() ([]segment, error) {
if logger.V(logger.TraceLevel) {
logger.Debugf("Parsing %q", p.tokens)
logger.Debug("Parsing %q", p.tokens)
}
segs, err := p.segments()
if err != nil {
return nil, err
}
if logger.V(logger.TraceLevel) {
logger.Tracef("accept segments: %q; %q", p.accepted, p.tokens)
logger.Trace("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.Tracef("accept eof: %q; %q", p.accepted, p.tokens)
logger.Trace("accept eof: %q; %q", p.accepted, p.tokens)
}
return segs, nil
}
@@ -128,7 +128,7 @@ func (p *parser) segments() ([]segment, error) {
}
if logger.V(logger.TraceLevel) {
logger.Tracef("accept segment: %q; %q", p.accepted, p.tokens)
logger.Trace("accept segment: %q; %q", p.accepted, p.tokens)
}
segs := []segment{s}
for {
@@ -141,7 +141,7 @@ func (p *parser) segments() ([]segment, error) {
}
segs = append(segs, s)
if logger.V(logger.TraceLevel) {
logger.Tracef("accept segment: %q; %q", p.accepted, p.tokens)
logger.Trace("accept segment: %q; %q", p.accepted, p.tokens)
}
}
}

2
util/router/parse_test.go
View File

@@ -316,6 +316,6 @@ func TestParseSegmentsWithErrors(t *testing.T) {
t.Errorf("parser{%q}.segments() succeeded; want InvalidTemplateError; accepted %#v", spec.tokens, segs)
continue
}
logger.Info(err)
logger.Info(err.Error())
}
}

16
util/router/runtime.go
View File

@@ -63,7 +63,7 @@ func NewPattern(version int, ops []int, pool []string, verb string, opts ...Patt
if version != 1 {
if logger.V(logger.DebugLevel) {
logger.Debugf("unsupported version: %d", version)
logger.Debug("unsupported version: %d", version)
}
return Pattern{}, ErrInvalidPattern
}
@@ -71,7 +71,7 @@ func NewPattern(version int, ops []int, pool []string, verb string, opts ...Patt
l := len(ops)
if l%2 != 0 {
if logger.V(logger.DebugLevel) {
logger.Debugf("odd number of ops codes: %d", l)
logger.Debug("odd number of ops codes: %d", l)
}
return Pattern{}, ErrInvalidPattern
}
@@ -105,7 +105,7 @@ func NewPattern(version int, ops []int, pool []string, verb string, opts ...Patt
case OpLitPush:
if op.operand < 0 || len(pool) <= op.operand {
if logger.V(logger.TraceLevel) {
logger.Tracef("negative literal index: %d", op.operand)
logger.Trace("negative literal index: %d", op.operand)
}
return Pattern{}, ErrInvalidPattern
}
@@ -116,7 +116,7 @@ func NewPattern(version int, ops []int, pool []string, verb string, opts ...Patt
case OpConcatN:
if op.operand <= 0 {
if logger.V(logger.TraceLevel) {
logger.Tracef("negative concat size: %d", op.operand)
logger.Trace("negative concat size: %d", op.operand)
}
return Pattern{}, ErrInvalidPattern
}
@@ -131,7 +131,7 @@ func NewPattern(version int, ops []int, pool []string, verb string, opts ...Patt
case OpCapture:
if op.operand < 0 || len(pool) <= op.operand {
if logger.V(logger.TraceLevel) {
logger.Tracef("variable name index out of bound: %d", op.operand)
logger.Trace("variable name index out of bound: %d", op.operand)
}
return Pattern{}, ErrInvalidPattern
}
@@ -147,7 +147,7 @@ func NewPattern(version int, ops []int, pool []string, verb string, opts ...Patt
}
default:
if logger.V(logger.DebugLevel) {
logger.Tracef("invalid opcode: %d", op.code)
logger.Trace("invalid opcode: %d", op.code)
}
return Pattern{}, ErrInvalidPattern
}
@@ -172,7 +172,7 @@ func NewPattern(version int, ops []int, pool []string, verb string, opts ...Patt
func MustPattern(p Pattern, err error) Pattern {
if err != nil {
if logger.V(logger.FatalLevel) {
logger.Fatalf("Pattern initialization failed: %v", err)
logger.Fatal("Pattern initialization failed: %v", err)
}
}
return p
@@ -235,7 +235,7 @@ func (p Pattern) Match(components []string, verb string) (map[string]string, err
if pos < l {
return nil, ErrNotMatch
}
bindings := make(map[string]string)
bindings := make(map[string]string, len(captured))
for i, val := range captured {
bindings[p.vars[i]] = val
}