diff --git a/grpc.go b/grpc.go index 6653913..4015780 100644 --- a/grpc.go +++ b/grpc.go @@ -17,7 +17,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/micro/go-micro/v2/broker" "github.com/micro/go-micro/v2/errors" - log "github.com/micro/go-micro/v2/logger" + "github.com/micro/go-micro/v2/logger" meta "github.com/micro/go-micro/v2/metadata" "github.com/micro/go-micro/v2/registry" "github.com/micro/go-micro/v2/server" @@ -358,8 +358,10 @@ func (g *grpcServer) processRequest(stream grpc.ServerStream, service *service, fn := func(ctx context.Context, req server.Request, rsp interface{}) (err error) { defer func() { if r := recover(); r != nil { - log.Error("panic recovered: ", r) - log.Error(string(debug.Stack())) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("panic recovered: ", r) + logger.Error(string(debug.Stack())) + } err = errors.InternalServerError("go.micro.server", "panic recovered: %v", r) } }() @@ -658,7 +660,9 @@ func (g *grpcServer) Register() error { g.Unlock() if !registered { - log.Infof("Registry [%s] Registering node: %s", config.Registry.String(), node.Id) + if logger.V(logger.InfoLevel, logger.DefaultLogger) { + logger.Infof("Registry [%s] Registering node: %s", config.Registry.String(), node.Id) + } } // create registry options @@ -693,7 +697,9 @@ func (g *grpcServer) Register() error { opts = append(opts, broker.DisableAutoAck()) } - log.Infof("Subscribing to topic: %s", sb.Topic()) + if logger.V(logger.InfoLevel, logger.DefaultLogger) { + logger.Infof("Subscribing to topic: %s", sb.Topic()) + } sub, err := config.Broker.Subscribe(sb.Topic(), handler, opts...) if err != nil { return err @@ -745,7 +751,9 @@ func (g *grpcServer) Deregister() error { Nodes: []*registry.Node{node}, } - log.Infof("Deregistering node: %s", node.Id) + if logger.V(logger.InfoLevel, logger.DefaultLogger) { + logger.Infof("Deregistering node: %s", node.Id) + } if err := config.Registry.Deregister(service); err != nil { return err } @@ -761,7 +769,9 @@ func (g *grpcServer) Deregister() error { for sb, subs := range g.subscribers { for _, sub := range subs { - log.Infof("Unsubscribing from topic: %s", sub.Topic()) + if logger.V(logger.InfoLevel, logger.DefaultLogger) { + logger.Infof("Unsubscribing from topic: %s", sub.Topic()) + } sub.Unsubscribe() } g.subscribers[sb] = nil @@ -807,7 +817,9 @@ func (g *grpcServer) Start() error { } } - log.Infof("Server [grpc] Listening on %s", ts.Addr().String()) + if logger.V(logger.InfoLevel, logger.DefaultLogger) { + logger.Infof("Server [grpc] Listening on %s", ts.Addr().String()) + } g.Lock() g.opts.Address = ts.Addr().String() g.Unlock() @@ -819,18 +831,24 @@ func (g *grpcServer) Start() error { return err } - log.Infof("Broker [%s] Connected to %s", config.Broker.String(), config.Broker.Address()) + if logger.V(logger.InfoLevel, logger.DefaultLogger) { + logger.Infof("Broker [%s] Connected to %s", config.Broker.String(), config.Broker.Address()) + } } // announce self to the world if err := g.Register(); err != nil { - log.Errorf("Server register error: ", err) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Errorf("Server register error: ", err) + } } // micro: go ts.Accept(s.accept) go func() { if err := g.srv.Serve(ts); err != nil { - log.Errorf("gRPC Server start error: ", err) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Errorf("gRPC Server start error: ", err) + } } }() @@ -852,7 +870,9 @@ func (g *grpcServer) Start() error { // register self on interval case <-t.C: if err := g.Register(); err != nil { - log.Error("Server register error: ", err) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("Server register error: ", err) + } } // wait for exit case ch = <-g.exit: @@ -862,7 +882,9 @@ func (g *grpcServer) Start() error { // deregister self if err := g.Deregister(); err != nil { - log.Error("Server deregister error: ", err) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("Server deregister error: ", err) + } } // wait for waitgroup @@ -887,7 +909,9 @@ func (g *grpcServer) Start() error { // close transport ch <- nil - log.Infof("Broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address()) + if logger.V(logger.InfoLevel, logger.DefaultLogger) { + logger.Infof("Broker [%s] Disconnected from %s", config.Broker.String(), config.Broker.Address()) + } // disconnect broker config.Broker.Disconnect() }() diff --git a/server.go b/server.go index 81bf9f7..024a90f 100644 --- a/server.go +++ b/server.go @@ -14,7 +14,7 @@ import ( "unicode" "unicode/utf8" - log "github.com/micro/go-micro/v2/logger" + "github.com/micro/go-micro/v2/logger" "github.com/micro/go-micro/v2/server" ) @@ -86,7 +86,9 @@ func prepareEndpoint(method reflect.Method) *methodType { replyType = mtype.In(3) contextType = mtype.In(1) default: - log.Error("method", mname, "of", mtype, "has wrong number of ins:", mtype.NumIn()) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("method", mname, "of", mtype, "has wrong number of ins:", mtype.NumIn()) + } return nil } @@ -94,7 +96,9 @@ func prepareEndpoint(method reflect.Method) *methodType { // check stream type streamType := reflect.TypeOf((*server.Stream)(nil)).Elem() if !argType.Implements(streamType) { - log.Error(mname, "argument does not implement Streamer interface:", argType) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error(mname, "argument does not implement Streamer interface:", argType) + } return nil } } else { @@ -102,30 +106,40 @@ func prepareEndpoint(method reflect.Method) *methodType { // First arg need not be a pointer. if !isExportedOrBuiltinType(argType) { - log.Error(mname, "argument type not exported:", argType) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error(mname, "argument type not exported:", argType) + } return nil } if replyType.Kind() != reflect.Ptr { - log.Error("method", mname, "reply type not a pointer:", replyType) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("method", mname, "reply type not a pointer:", replyType) + } return nil } // Reply type must be exported. if !isExportedOrBuiltinType(replyType) { - log.Error("method", mname, "reply type not exported:", replyType) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("method", mname, "reply type not exported:", replyType) + } return nil } } // Endpoint() needs one out. if mtype.NumOut() != 1 { - log.Error("method", mname, "has wrong number of outs:", mtype.NumOut()) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("method", mname, "has wrong number of outs:", mtype.NumOut()) + } return nil } // The return type of the method must be error. if returnType := mtype.Out(0); returnType != typeOfError { - log.Error("method", mname, "returns", returnType.String(), "not error") + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("method", mname, "returns", returnType.String(), "not error") + } return nil } return &methodType{method: method, ArgType: argType, ReplyType: replyType, ContextType: contextType, stream: stream} @@ -142,11 +156,13 @@ func (server *rServer) register(rcvr interface{}) error { s.rcvr = reflect.ValueOf(rcvr) sname := reflect.Indirect(s.rcvr).Type().Name() if sname == "" { - log.Fatal("rpc: no service name for type", s.typ.String()) + logger.Fatal("rpc: no service name for type", s.typ.String()) } if !isExported(sname) { s := "rpc Register: type " + sname + " is not exported" - log.Error(s) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error(s) + } return errors.New(s) } if _, present := server.serviceMap[sname]; present { @@ -165,7 +181,9 @@ func (server *rServer) register(rcvr interface{}) error { if len(s.method) == 0 { s := "rpc Register: type " + sname + " has no exported methods of suitable type" - log.Error(s) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error(s) + } return errors.New(s) } server.serviceMap[s.name] = s diff --git a/subscriber.go b/subscriber.go index c36071f..5ac957c 100644 --- a/subscriber.go +++ b/subscriber.go @@ -9,7 +9,7 @@ import ( "github.com/micro/go-micro/v2/broker" "github.com/micro/go-micro/v2/errors" - log "github.com/micro/go-micro/v2/logger" + "github.com/micro/go-micro/v2/logger" "github.com/micro/go-micro/v2/metadata" "github.com/micro/go-micro/v2/registry" "github.com/micro/go-micro/v2/server" @@ -171,8 +171,10 @@ func (g *grpcServer) createSubHandler(sb *subscriber, opts server.Options) broke defer func() { if r := recover(); r != nil { - log.Error("panic recovered: ", r) - log.Error(string(debug.Stack())) + if logger.V(logger.ErrorLevel, logger.DefaultLogger) { + logger.Error("panic recovered: ", r) + logger.Error(string(debug.Stack())) + } err = errors.InternalServerError("go.micro.server", "panic recovered: %v", r) } }()