From: subhash kumar singh <subh.singh@samsung.com>
Date: Mon, 23 Dec 2024 10:00:32 +0000 (+0000)
Subject: Integrate slog with logger
X-Git-Tag: 4.0.0~15
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F13959%2F1;p=aiml-fw%2Fawmf%2Fmodelmgmtservice.git

Integrate slog with logger

Integrated slog with logger.

Change-Id: If2ae8ffe505b3248254eac941fbb002c1b061b59
Signed-off-by: subhash kumar singh <subh.singh@samsung.com>
---

diff --git a/apis/mmes_apis.go b/apis/mmes_apis.go
index 017c417..36349dc 100644
--- a/apis/mmes_apis.go
+++ b/apis/mmes_apis.go
@@ -71,9 +71,9 @@ func (m *MmeApiHandler) RegisterModel(cont *gin.Context) {
 		})
 		return
 	}
-    // by default when a model is registered its artifact version is set to 0.0.0
-    modelInfo.ModelId.ArtifactVersion = "0.0.0"
-    
+	// by default when a model is registered its artifact version is set to 0.0.0
+	modelInfo.ModelId.ArtifactVersion = "0.0.0"
+
 	if err := m.iDB.Create(modelInfo); err != nil {
 		logging.ERROR("error", err)
 		cont.JSON(http.StatusBadRequest, gin.H{
@@ -314,7 +314,7 @@ func (m *MmeApiHandler) UpdateModel(c *gin.Context) {
 	}
 
 	if err := m.iDB.Update(modelInfo); err != nil {
-		logging.ERROR(err)
+		logging.ERROR("error in update db", "Error:", err)
 		return
 	}
 
@@ -338,7 +338,7 @@ func (m *MmeApiHandler) DeleteModel(cont *gin.Context) {
 	cont.JSON(http.StatusNoContent, nil)
 }
 
-func (m *MmeApiHandler) UpdateArtifact(cont *gin.Context){
+func (m *MmeApiHandler) UpdateArtifact(cont *gin.Context) {
 	logging.INFO("Update artifact version of model")
 	// var modelInfo *models.ModelRelatedInformation
 	modelname := cont.Param("modelname")
@@ -355,11 +355,11 @@ func (m *MmeApiHandler) UpdateArtifact(cont *gin.Context){
 	}
 	modelInfo.ModelId.ArtifactVersion = artifactversion
 	if err := m.iDB.Update(*modelInfo); err != nil {
-		logging.ERROR(err)
+		logging.ERROR("error in updated db", "error:", err)
 		return
 	}
 	logging.INFO("model updated")
 	cont.JSON(http.StatusOK, gin.H{
 		"modelinfo": modelInfo,
 	})
-}
\ No newline at end of file
+}
diff --git a/apis_test/mmes_apis_test.go b/apis_test/mmes_apis_test.go
index 159db44..dbdcc4c 100644
--- a/apis_test/mmes_apis_test.go
+++ b/apis_test/mmes_apis_test.go
@@ -146,7 +146,7 @@ func TestWhenSuccessGetModelInfoList(t *testing.T) {
 	body, _ := io.ReadAll(response.Body)
 
 	var modelInfos []models.ModelRelatedInformation
-	logging.INFO(modelInfos)
+	logging.INFO("modelinfo", "list:", modelInfos)
 	json.Unmarshal(body, &modelInfos)
 
 	assert.Equal(t, 200, responseRecorder.Code)
diff --git a/core/s3_manager.go b/core/s3_manager.go
index 1a38154..867de59 100644
--- a/core/s3_manager.go
+++ b/core/s3_manager.go
@@ -100,7 +100,7 @@ func (s3manager *S3Manager) CreateBucket(bucketName string) (err error) {
 	_, s3Err := s3manager.S3Client.CreateBucket(&s3.CreateBucketInput{Bucket: aws.String(bucketName)})
 
 	if s3Err != nil {
-		logging.ERROR(s3Err)
+		logging.ERROR("error", "s3Error:", s3Err)
 		//Convert the aws to get the code/error msg for api response
 		if aerr, ok := s3Err.(awserr.Error); ok {
 			err = errors.New(aerr.Message())
diff --git a/logging/logging.go b/logging/logging.go
index 5818827..cc9a1a8 100644
--- a/logging/logging.go
+++ b/logging/logging.go
@@ -18,39 +18,38 @@ limitations under the License.
 package logging
 
 import (
-	"log"
 	"os"
 )
 
-var infoLogger *log.Logger
-var warnLogger *log.Logger
-var errorLogger *log.Logger
+var (
+	LOG_LEVEL     = "LOG_LEVEL"
+	LOG_FILE_NAME = "LOG_FILE_NAME"
+)
 
 func init() {
-	//TODO add current timestamp as file prefix to retain the old log file
-	logFile, fileErr := os.Create(os.Getenv("LOG_FILE_NAME"))
-	if fileErr != nil {
-		log.Fatal("Can not start MMES service,issue in creating log file")
-	}
-	flags := log.Ldate | log.Ltime
-	infoLogger = log.New(logFile, "INFO:", flags)
-	warnLogger = log.New(logFile, "WARN:", flags)
-	errorLogger = log.New(logFile, "ERROR:", flags)
 
+	var logLevel string
+	val, flg := os.LookupEnv(LOG_LEVEL)
+	if flg {
+		logLevel = val
+	} else {
+		logLevel = "DEBUG"
+	}
+	Load(logLevel, os.Getenv(LOG_FILE_NAME))
 	INFO("Loggers loaded ..")
 }
 
 // Prefixes INFO for each log message
-func INFO(logParams ...interface{}) {
-	infoLogger.Println(logParams...)
+func INFO(msg string, logParams ...interface{}) {
+	Logger.Info(msg, logParams...)
 }
 
 // Prefixes WARN for each log message
-func WARN(logParams ...interface{}) {
-	warnLogger.Println(logParams...)
+func WARN(msg string, logParams ...interface{}) {
+	Logger.Info(msg, logParams...)
 }
 
 // Prefixes ERROR for each log message
-func ERROR(logParams ...interface{}) {
-	errorLogger.Println(logParams...)
+func ERROR(msg string, logParams ...interface{}) {
+	Logger.Info(msg, logParams...)
 }
diff --git a/main.go b/main.go
index 560c748..25eb27d 100644
--- a/main.go
+++ b/main.go
@@ -36,12 +36,12 @@ import (
 
 func main() {
 	if err := config.Load(config.NewConfigDataValidator(), config.NewEnvDataLoader(nil)); err != nil {
-		logging.ERROR(err)
+		logging.ERROR("error in loading config", "error", err)
 		os.Exit(-1)
 	}
 
 	configManager := config.GetConfigManager()
-	logging.INFO(configManager)
+	logging.INFO("config mgr prepared", "configmgr", configManager)
 	// setup the database connection
 
 	// connection string