X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Flogger.go;h=cd1b03b2ebde296fd1aba479707078b5dc1e04f4;hb=d1fcac7ec9fb1957caacda20d89bc5e4bd727412;hp=a73cb36274656488fd5642facfa4bf252d6f9eb7;hpb=2e78e42c5896b61b77ab3a97e45704f6749161b2;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/logger.go b/pkg/xapp/logger.go
index a73cb36..cd1b03b 100755
--- a/pkg/xapp/logger.go
+++ b/pkg/xapp/logger.go
@@ -19,66 +19,52 @@
 
 package xapp
 
-/*
-#cgo CFLAGS: -I/usr/local/include
-#cgo LDFLAGS: -lmdclog
-#
-#include <mdclog/mdclog.h>
-void xAppMgr_mdclog_write(mdclog_severity_t severity, const char *msg) {
-     mdclog_write(severity, "%s", msg);
-}
-*/
-import "C"
-
 import (
 	"fmt"
-	"log"
+	mdclog "gerrit.o-ran-sc.org/r/com/golog"
 	"time"
 )
 
 type Log struct {
+	logger *mdclog.MdcLogger
 }
 
-const (
-	LogLvlErr   = C.MDCLOG_ERR
-	LogLvlWarn  = C.MDCLOG_WARN
-	LogLvlInfo  = C.MDCLOG_INFO
-	LogLvlDebug = C.MDCLOG_DEBUG
-)
-
-func WriteLog(lvl C.mdclog_severity_t, msg string) {
-	t := time.Now().Format("2019-01-02 15:04:05")
-	text := fmt.Sprintf("%s:: %s ", t, msg)
-
-	C.xAppMgr_mdclog_write(lvl, C.CString(text))
+func NewLogger(name string) *Log {
+	l, _ := mdclog.InitLogger(name)
+	return &Log{
+		logger: l,
+	}
 }
 
-func (Log) SetLevel(level int) {
-	l := C.mdclog_severity_t(level)
-	C.mdclog_level_set(l)
+func (l *Log) SetLevel(level int) {
+	l.logger.LevelSet(mdclog.Level(level))
 }
 
-func (Log) SetMdc(key string, value string) {
-	C.mdclog_mdc_add(C.CString(key), C.CString(value))
+func (l *Log) SetMdc(key string, value string) {
+	l.logger.MdcAdd(key, value)
 }
 
-func (Log) Fatal(pattern string, args ...interface{}) {
-	WriteLog(LogLvlErr, fmt.Sprintf(pattern, args...))
-	log.Panic("Fatal error occured, exiting ...")
+func (l *Log) Error(pattern string, args ...interface{}) {
+	l.SetMdc("time", timeFormat())
+	l.logger.Error(pattern, args...)
 }
 
-func (Log) Error(pattern string, args ...interface{}) {
-	WriteLog(LogLvlErr, fmt.Sprintf(pattern, args...))
+func (l *Log) Warn(pattern string, args ...interface{}) {
+	l.SetMdc("time", timeFormat())
+	l.logger.Warning(pattern, args...)
 }
 
-func (Log) Warn(pattern string, args ...interface{}) {
-	WriteLog(LogLvlWarn, fmt.Sprintf(pattern, args...))
+func (l *Log) Info(pattern string, args ...interface{}) {
+	l.SetMdc("time", timeFormat())
+	l.logger.Info(pattern, args...)
 }
 
-func (Log) Info(pattern string, args ...interface{}) {
-	WriteLog(LogLvlInfo, fmt.Sprintf(pattern, args...))
+func (l *Log) Debug(pattern string, args ...interface{}) {
+	l.SetMdc("time", timeFormat())
+	l.logger.Debug(pattern, args...)
 }
 
-func (Log) Debug(pattern string, args ...interface{}) {
-	WriteLog(LogLvlDebug, fmt.Sprintf(pattern, args...))
+func timeFormat() string {
+	t := time.Now()
+	return fmt.Sprintf("%d-%02d-%02dT%02d:%02d:%02d", t.Year(), t.Month(), t.Day(), t.Hour(), t.Minute(), t.Second())
 }