Use internal/logger everywhere in handler

master
René Jochum 2 years ago
parent ed8d8b6845
commit 6d43a49067
Signed by: jochum
GPG Key ID: F7D906F5E51E8E5E

@ -13,9 +13,9 @@ import (
"go-micro.dev/v4" "go-micro.dev/v4"
"go-micro.dev/v4/client" "go-micro.dev/v4/client"
"go-micro.dev/v4/errors" "go-micro.dev/v4/errors"
"go-micro.dev/v4/logger"
"google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/emptypb"
"jochum.dev/jo-micro/router/cmd/microrouterd/config" "jochum.dev/jo-micro/router/cmd/microrouterd/config"
iLogger "jochum.dev/jo-micro/router/internal/logger"
"jochum.dev/jo-micro/router/internal/proto/routerclientpb" "jochum.dev/jo-micro/router/internal/proto/routerclientpb"
"jochum.dev/jo-micro/router/internal/proto/routerserverpb" "jochum.dev/jo-micro/router/internal/proto/routerserverpb"
"jochum.dev/jo-micro/router/internal/util" "jochum.dev/jo-micro/router/internal/util"
@ -51,16 +51,16 @@ func (h *Handler) Start() error {
for { for {
services, err := util.FindByEndpoint(h.service, "RouterClientService.Routes") services, err := util.FindByEndpoint(h.service, "RouterClientService.Routes")
if err != nil { if err != nil {
logger.Error(err) iLogger.WithCaller().Error(err)
continue continue
} }
for _, s := range services { for _, s := range services {
logger.Debug("Found service ", s.Name) iLogger.WithCaller().Debug("Found service ", s.Name)
client := routerclientpb.NewRouterClientService(s.Name, h.service.Client()) client := routerclientpb.NewRouterClientService(s.Name, h.service.Client())
resp, err := client.Routes(ctx, &emptypb.Empty{}) resp, err := client.Routes(ctx, &emptypb.Empty{})
if err != nil { if err != nil {
logger.Error(err) iLogger.WithCaller().Error(err)
// failure in getting routes, silently ignore // failure in getting routes, silently ignore
continue continue
} }
@ -68,7 +68,7 @@ func (h *Handler) Start() error {
serviceGroup := globalGroup.Group(fmt.Sprintf("/%s", resp.GetRouterURI())) serviceGroup := globalGroup.Group(fmt.Sprintf("/%s", resp.GetRouterURI()))
for _, route := range resp.Routes { for _, route := range resp.Routes {
logger.Debug("Found endpoint ", route.Endpoint) iLogger.WithCaller().Debug("Found endpoint ", route.Endpoint)
var g *gin.RouterGroup = nil var g *gin.RouterGroup = nil
if route.IsGlobal { if route.IsGlobal {
@ -173,7 +173,7 @@ func (h *Handler) proxy(serviceName string, route *routerclientpb.RoutesReply_Ro
var response json.RawMessage var response json.RawMessage
err := h.service.Client().Call(ctx, req, &response) err := h.service.Client().Call(ctx, req, &response)
if err != nil { if err != nil {
logger.Error(err) iLogger.WithCaller().Error(err)
pErr := errors.FromError(err) pErr := errors.FromError(err)
code := int(http.StatusInternalServerError) code := int(http.StatusInternalServerError)

Loading…
Cancel
Save