From 6c959bb2f8243b3e75c4bb94581a47f7054dbd76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Jochum?= <rene@jochum.dev>
Date: Wed, 21 Sep 2022 23:51:07 +0200
Subject: [PATCH] Rename internal/logger to internal/ilogger

---
 cmd/microrouterd/handler/handler.go           | 14 ++++-----
 cmd/microrouterd/main.go                      | 30 +++++++++----------
 .../{logger/logger.go => ilogger/ilogger.go}  |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)
 rename internal/{logger/logger.go => ilogger/ilogger.go} (99%)

diff --git a/cmd/microrouterd/handler/handler.go b/cmd/microrouterd/handler/handler.go
index d6dbf8e..3b14d3a 100644
--- a/cmd/microrouterd/handler/handler.go
+++ b/cmd/microrouterd/handler/handler.go
@@ -16,7 +16,7 @@ import (
 	"google.golang.org/protobuf/types/known/emptypb"
 	"jochum.dev/jo-micro/auth2"
 	auth "jochum.dev/jo-micro/auth2"
-	iLogger "jochum.dev/jo-micro/router/internal/logger"
+	"jochum.dev/jo-micro/router/internal/ilogger"
 	"jochum.dev/jo-micro/router/internal/proto/routerclientpb"
 	"jochum.dev/jo-micro/router/internal/proto/routerserverpb"
 	"jochum.dev/jo-micro/router/internal/util"
@@ -54,21 +54,21 @@ func (h *Handler) Init(service micro.Service, engine *gin.Engine, routerAuth aut
 		for {
 			services, err := util.FindByEndpoint(h.service, "RouterClientService.Routes")
 			if err != nil {
-				iLogger.Logrus().Error(err)
+				ilogger.Logrus().Error(err)
 				continue
 			}
 
 			for _, s := range services {
-				iLogger.Logrus().WithField("service", s.Name).Tracef("Found service")
+				ilogger.Logrus().WithField("service", s.Name).Tracef("Found service")
 				client := routerclientpb.NewRouterClientService(s.Name, h.service.Client())
 				sCtx, err := auth2.ClientAuthRegistry().Plugin().ServiceContext(ctx)
 				if err != nil {
-					iLogger.Logrus().Error(err)
+					ilogger.Logrus().Error(err)
 					continue
 				}
 				resp, err := client.Routes(sCtx, &emptypb.Empty{})
 				if err != nil {
-					iLogger.Logrus().Error(err)
+					ilogger.Logrus().Error(err)
 					// failure in getting routes, silently ignore
 					continue
 				}
@@ -88,7 +88,7 @@ func (h *Handler) Init(service micro.Service, engine *gin.Engine, routerAuth aut
 					pathMethod := fmt.Sprintf("%s:%s%s", route.GetMethod(), g.BasePath(), route.GetPath())
 					path := fmt.Sprintf("%s%s", g.BasePath(), route.GetPath())
 					if _, ok := h.routes[pathMethod]; !ok {
-						iLogger.Logrus().
+						ilogger.Logrus().
 							WithField("service", s.Name).
 							WithField("endpoint", route.GetEndpoint()).
 							WithField("method", route.GetMethod()).
@@ -197,7 +197,7 @@ func (h *Handler) proxy(serviceName string, route *routerclientpb.RoutesReply_Ro
 		var response json.RawMessage
 		err = h.service.Client().Call(ctx, req, &response)
 		if err != nil {
-			iLogger.Logrus().Error(err)
+			ilogger.Logrus().Error(err)
 
 			pErr := errors.FromError(err)
 			code := int(http.StatusInternalServerError)
diff --git a/cmd/microrouterd/main.go b/cmd/microrouterd/main.go
index d4100d7..2cf8c69 100644
--- a/cmd/microrouterd/main.go
+++ b/cmd/microrouterd/main.go
@@ -15,7 +15,7 @@ import (
 
 	"jochum.dev/jo-micro/router/cmd/microrouterd/config"
 	"jochum.dev/jo-micro/router/cmd/microrouterd/handler"
-	iLogger "jochum.dev/jo-micro/router/internal/logger"
+	"jochum.dev/jo-micro/router/internal/ilogger"
 	"jochum.dev/jo-micro/router/internal/proto/routerserverpb"
 	"jochum.dev/jo-micro/router/internal/util"
 )
@@ -28,7 +28,7 @@ func internalService(routerHandler *handler.Handler) {
 		micro.Version(config.Version),
 		micro.Action(func(c *cli.Context) error {
 			if err := auth2.ClientAuthRegistry().Init(c, srv); err != nil {
-				iLogger.Logrus().Fatal(err)
+				ilogger.Logrus().Fatal(err)
 			}
 
 			routerserverpb.RegisterRouterServerServiceHandler(srv.Server(), routerHandler)
@@ -51,17 +51,17 @@ func internalService(routerHandler *handler.Handler) {
 
 	// Run server
 	if err := srv.Run(); err != nil {
-		iLogger.Logrus().Fatal(err)
+		ilogger.Logrus().Fatal(err)
 	}
 
 	// Stop the handler
 	if err := routerHandler.Stop(); err != nil {
-		iLogger.Logrus().Fatal(err)
+		ilogger.Logrus().Fatal(err)
 	}
 
 	// Stop the client/service auth plugin
 	if err := auth2.ClientAuthRegistry().Stop(); err != nil {
-		iLogger.Logrus().Fatal(err)
+		ilogger.Logrus().Fatal(err)
 	}
 }
 
@@ -72,7 +72,7 @@ func main() {
 
 	routerAuthReg := auth2.RouterAuthRegistry()
 
-	flags := iLogger.AppendFlags(routerAuthReg.AppendFlags(auth2.ClientAuthRegistry().AppendFlags([]cli.Flag{
+	flags := ilogger.AppendFlags(routerAuthReg.AppendFlags(auth2.ClientAuthRegistry().AppendFlags([]cli.Flag{
 		// General
 		&cli.BoolFlag{
 			Name:    "router_debugmode",
@@ -112,14 +112,14 @@ func main() {
 		micro.Flags(flags...),
 		micro.Action(func(c *cli.Context) error {
 			// Start the logger
-			if err := iLogger.Start(c); err != nil {
+			if err := ilogger.Start(c); err != nil {
 				log.Fatal(err)
 				return err
 			}
 
 			// Initialize the Auth Plugin over RouterAuthRegistry
 			if err := routerAuthReg.Init(c, srv); err != nil {
-				iLogger.Logrus().Fatal(err)
+				ilogger.Logrus().Fatal(err)
 			}
 
 			// Initialize GIN
@@ -132,15 +132,15 @@ func main() {
 
 			// Initalize the Handler
 			if err := routerHandler.Init(srv, r, routerAuthReg.Plugin(), c.Int("router_refresh")); err != nil {
-				iLogger.Logrus().Fatal(err)
+				ilogger.Logrus().Fatal(err)
 			}
 
 			// Add middlewares to gin
-			r.Use(ginlogrus.Logger(iLogger.Logrus()), gin.Recovery())
+			r.Use(ginlogrus.Logger(ilogger.Logrus()), gin.Recovery())
 
 			// Register gin with micro
 			if err := micro.RegisterHandler(srv.Server(), r); err != nil {
-				iLogger.Logrus().Fatal(err)
+				ilogger.Logrus().Fatal(err)
 			}
 
 			return nil
@@ -152,16 +152,16 @@ func main() {
 
 	// Run server
 	if err := srv.Run(); err != nil {
-		iLogger.Logrus().Fatal(err)
+		ilogger.Logrus().Fatal(err)
 	}
 
 	// Stop the plugin in RouterAuthRegistry
 	if err := routerAuthReg.Stop(); err != nil {
-		iLogger.Logrus().Fatal(err)
+		ilogger.Logrus().Fatal(err)
 	}
 
 	// Stop the logger
-	if err := iLogger.Stop(); err != nil {
-		iLogger.Logrus().Fatal(err)
+	if err := ilogger.Stop(); err != nil {
+		ilogger.Logrus().Fatal(err)
 	}
 }
diff --git a/internal/logger/logger.go b/internal/ilogger/ilogger.go
similarity index 99%
rename from internal/logger/logger.go
rename to internal/ilogger/ilogger.go
index 349ab02..e42d028 100644
--- a/internal/logger/logger.go
+++ b/internal/ilogger/ilogger.go
@@ -1,4 +1,4 @@
-package logger
+package ilogger
 
 import (
 	"fmt"