From 16c4b8ab76ea53e2f011dac05a325424e86c04f5 Mon Sep 17 00:00:00 2001
From: Lakhan Samani <lakhan.m.samani@gmail.com>
Date: Thu, 17 Nov 2022 10:35:38 +0530
Subject: [PATCH] fix(server): global logging

---
 server/logs/logs.go | 2 --
 server/main.go      | 8 ++++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/server/logs/logs.go b/server/logs/logs.go
index 9773b39..924548c 100644
--- a/server/logs/logs.go
+++ b/server/logs/logs.go
@@ -19,8 +19,6 @@ func (u LogUTCFormatter) Format(e *log.Entry) ([]byte, error) {
 }
 
 func InitLog(cliLogLevel string) *log.Logger {
-	// global log level
-	logrus.SetFormatter(LogUTCFormatter{&logrus.JSONFormatter{}})
 
 	// log instance for gin server
 	log := logrus.New()
diff --git a/server/main.go b/server/main.go
index 7b51187..b2b0e90 100644
--- a/server/main.go
+++ b/server/main.go
@@ -12,6 +12,7 @@ import (
 	"github.com/authorizerdev/authorizer/server/oauth"
 	"github.com/authorizerdev/authorizer/server/refs"
 	"github.com/authorizerdev/authorizer/server/routes"
+	"github.com/sirupsen/logrus"
 )
 
 // VERSION is used to define the version of authorizer from build tags
@@ -25,16 +26,19 @@ func main() {
 	cli.ARG_REDIS_URL = flag.String("redis_url", "", "Redis connection string")
 	flag.Parse()
 
-	log := logs.InitLog(refs.StringValue(cli.ARG_LOG_LEVEL))
+	// global log level
+	logrus.SetFormatter(logs.LogUTCFormatter{&logrus.JSONFormatter{}})
 
 	constants.VERSION = VERSION
 
 	// initialize required envs (mainly db, env file path and redis)
 	err := memorystore.InitRequiredEnv()
 	if err != nil {
-		log.Fatal("Error while initializing required envs: ", err)
+		logrus.Fatal("Error while initializing required envs: ", err)
 	}
 
+	log := logs.InitLog(refs.StringValue(cli.ARG_LOG_LEVEL))
+
 	// initialize memory store
 	err = memorystore.InitMemStore()
 	if err != nil {