From 34cef601b19a05b0d59e6e0543216ea6c7276302 Mon Sep 17 00:00:00 2001 From: Angith Date: Fri, 2 Sep 2022 14:11:02 +0530 Subject: [PATCH 1/9] Logging framework is used in svc-api for logging requirements --- lib-utilities/logs/formatter.go | 5 +++-- lib-utilities/logs/logger.go | 12 +++++++++++- .../helmcharts/api/templates/deployment.yaml | 8 ++++++++ svc-api/handle/account.go | 2 +- svc-api/handle/aggregator.go | 2 +- svc-api/handle/chassis.go | 2 +- svc-api/handle/compositionservice.go | 2 +- svc-api/handle/events.go | 2 +- svc-api/handle/fabrics.go | 2 +- svc-api/handle/handlers.go | 2 +- svc-api/handle/licenses.go | 2 +- svc-api/handle/managers.go | 2 +- svc-api/handle/role.go | 2 +- svc-api/handle/sessions.go | 2 +- svc-api/handle/systems.go | 2 +- svc-api/handle/task.go | 2 +- svc-api/handle/telemetry.go | 2 +- svc-api/handle/update.go | 2 +- svc-api/main.go | 17 +++++++++++++---- svc-api/middleware/middleware.go | 2 +- svc-api/models/registries.go | 3 ++- svc-api/ratelimiter/ratelimiter.go | 2 +- svc-api/router/router.go | 4 ++-- 23 files changed, 56 insertions(+), 27 deletions(-) diff --git a/lib-utilities/logs/formatter.go b/lib-utilities/logs/formatter.go index fbe48e756..77c563f63 100644 --- a/lib-utilities/logs/formatter.go +++ b/lib-utilities/logs/formatter.go @@ -23,6 +23,7 @@ import ( var priorityLogFields = []string{ "host", + "procid", } var syslogPriorityNumerics = map[string]int8{ @@ -59,7 +60,7 @@ type ODIMSysLogFormatter struct{} func (f *ODIMSysLogFormatter) Format(entry *logrus.Entry) ([]byte, error) { level := entry.Level.String() priorityNumber := findSysLogPriorityNumeric(level) - sysLogMsg := fmt.Sprintf("<%d> %s %s", priorityNumber, entry.Time.UTC().Format(time.RFC3339), level) + sysLogMsg := fmt.Sprintf("<%d> %s %s ", priorityNumber, entry.Time.UTC().Format(time.RFC3339), level) sysLogMsg = formatPriorityFields(entry, sysLogMsg) for k, v := range logFields { if accountLog, present := formatSyslog(k, v, entry); present { @@ -80,7 +81,7 @@ func formatPriorityFields(entry *logrus.Entry, msg string) string { for _, v := range priorityLogFields { if val, ok := entry.Data[v]; ok { present = false - msg = fmt.Sprintf("%s %v ", msg, val) + msg = fmt.Sprintf("%s%v ", msg, val) } } if !present { diff --git a/lib-utilities/logs/logger.go b/lib-utilities/logs/logger.go index 3e041913e..6c2cac1af 100644 --- a/lib-utilities/logs/logger.go +++ b/lib-utilities/logs/logger.go @@ -20,7 +20,7 @@ import ( // Logger is used when you import the log package in your service // and logging using the package level methods. -// This can be customized using the functions InitSysLogger or InitJSONLogger +// This can be customized using the function InitLogger var Logger *logrus.Entry // LogFormat type @@ -36,6 +36,8 @@ const ( // Config is used for user configuration type Config struct { LogFormat LogFormat + Host string + ProcID string } // InitLogger sets up the Logger and sets up the format and level @@ -52,6 +54,14 @@ func InitLogger(c *Config) { Logger.Logger.SetFormatter(&ODIMSysLogFormatter{}) } + if c.Host != "" { + Logger = Logger.WithField("host", c.Host) + } + + if c.ProcID != "" { + Logger = Logger.WithField("procid", c.ProcID) + } + // set the minimum level for logging Logger.Logger.SetLevel(logrus.DebugLevel) } diff --git a/odim-controller/helmcharts/api/templates/deployment.yaml b/odim-controller/helmcharts/api/templates/deployment.yaml index ec1c03d59..73dd261ad 100644 --- a/odim-controller/helmcharts/api/templates/deployment.yaml +++ b/odim-controller/helmcharts/api/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: api:{{ .Values.odimra.apiImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/svc-api/handle/account.go b/svc-api/handle/account.go index de0d13da2..6e259ab73 100644 --- a/svc-api/handle/account.go +++ b/svc-api/handle/account.go @@ -20,10 +20,10 @@ import ( "net/http" "github.com/ODIM-Project/ODIM/lib-utilities/common" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" accountproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/account" "github.com/ODIM-Project/ODIM/lib-utilities/response" iris "github.com/kataras/iris/v12" - log "github.com/sirupsen/logrus" ) // AccountRPCs defines all the RPC methods in account service diff --git a/svc-api/handle/aggregator.go b/svc-api/handle/aggregator.go index 0748dded7..3cfad25e7 100644 --- a/svc-api/handle/aggregator.go +++ b/svc-api/handle/aggregator.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" aggregatorproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/aggregator" diff --git a/svc-api/handle/chassis.go b/svc-api/handle/chassis.go index 256f4c321..a8c98ff46 100644 --- a/svc-api/handle/chassis.go +++ b/svc-api/handle/chassis.go @@ -21,10 +21,10 @@ import ( "net/http" "github.com/ODIM-Project/ODIM/lib-utilities/common" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" chassisproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/chassis" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/kataras/iris/v12" - log "github.com/sirupsen/logrus" ) // ChassisRPCs defines all the RPC methods in system service diff --git a/svc-api/handle/compositionservice.go b/svc-api/handle/compositionservice.go index 1e637ff25..5f16fecfe 100755 --- a/svc-api/handle/compositionservice.go +++ b/svc-api/handle/compositionservice.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" diff --git a/svc-api/handle/events.go b/svc-api/handle/events.go index 18aeb93ba..1cbea6df7 100644 --- a/svc-api/handle/events.go +++ b/svc-api/handle/events.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" eventsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/events" diff --git a/svc-api/handle/fabrics.go b/svc-api/handle/fabrics.go index 06d27ff61..b0da5ef52 100644 --- a/svc-api/handle/fabrics.go +++ b/svc-api/handle/fabrics.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" fabricsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/fabrics" diff --git a/svc-api/handle/handlers.go b/svc-api/handle/handlers.go index 6f81e2871..8321c9d78 100755 --- a/svc-api/handle/handlers.go +++ b/svc-api/handle/handlers.go @@ -22,7 +22,7 @@ import ( "net/http" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-api/handle/licenses.go b/svc-api/handle/licenses.go index e78dd62a3..2040be810 100644 --- a/svc-api/handle/licenses.go +++ b/svc-api/handle/licenses.go @@ -20,10 +20,10 @@ import ( "net/http" "github.com/ODIM-Project/ODIM/lib-utilities/common" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" licenseproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/licenses" "github.com/ODIM-Project/ODIM/lib-utilities/response" iris "github.com/kataras/iris/v12" - log "github.com/sirupsen/logrus" ) // LicenseRPCs defines all the RPC methods in license service diff --git a/svc-api/handle/managers.go b/svc-api/handle/managers.go index f052b6d8e..458c75fd5 100644 --- a/svc-api/handle/managers.go +++ b/svc-api/handle/managers.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" managersproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/managers" diff --git a/svc-api/handle/role.go b/svc-api/handle/role.go index a0f4ea6f0..855c27609 100644 --- a/svc-api/handle/role.go +++ b/svc-api/handle/role.go @@ -20,10 +20,10 @@ import ( "net/http" "github.com/ODIM-Project/ODIM/lib-utilities/common" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" roleproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/role" "github.com/ODIM-Project/ODIM/lib-utilities/response" iris "github.com/kataras/iris/v12" - log "github.com/sirupsen/logrus" ) // RoleRPCs defines all the RPC methods in role diff --git a/svc-api/handle/sessions.go b/svc-api/handle/sessions.go index 62b391f0a..56ce1756b 100644 --- a/svc-api/handle/sessions.go +++ b/svc-api/handle/sessions.go @@ -20,7 +20,7 @@ import ( "net/http" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" sessionproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/session" diff --git a/svc-api/handle/systems.go b/svc-api/handle/systems.go index ea11ef9d2..936361d4e 100644 --- a/svc-api/handle/systems.go +++ b/svc-api/handle/systems.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" systemsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/systems" diff --git a/svc-api/handle/task.go b/svc-api/handle/task.go index 374d4f5e0..56dd1f3a0 100644 --- a/svc-api/handle/task.go +++ b/svc-api/handle/task.go @@ -18,7 +18,7 @@ package handle import ( "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" taskproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/task" diff --git a/svc-api/handle/telemetry.go b/svc-api/handle/telemetry.go index 534a88114..2a895466b 100644 --- a/svc-api/handle/telemetry.go +++ b/svc-api/handle/telemetry.go @@ -18,7 +18,7 @@ package handle import ( "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" telemetryproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/telemetry" diff --git a/svc-api/handle/update.go b/svc-api/handle/update.go index cea1f7a3d..f6b6104cd 100644 --- a/svc-api/handle/update.go +++ b/svc-api/handle/update.go @@ -22,7 +22,7 @@ import ( "net/url" "reflect" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" updateproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/update" diff --git a/svc-api/main.go b/svc-api/main.go index 62d5b4783..0ba17c393 100644 --- a/svc-api/main.go +++ b/svc-api/main.go @@ -16,14 +16,14 @@ package main import ( "encoding/base64" "encoding/json" + "fmt" "net/http" "os" "strings" - "github.com/sirupsen/logrus" - "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" sessionproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/session" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/lib-utilities/services" @@ -32,9 +32,18 @@ import ( iris "github.com/kataras/iris/v12" ) -var log = logrus.New() - func main() { + // setting up the logging framework + hostname := os.Getenv("HOST_NAME") + podname := os.Getenv("POD_NAME") + pid := os.Getpid() + c := &log.Config{ + LogFormat: log.SysLogFormat, + Host: hostname, + ProcID: podname + fmt.Sprintf("_%d", pid), + } + log.InitLogger(c) + // verifying the uid of the user if uid := os.Geteuid(); uid == 0 { log.Fatal("Api Service should not be run as the root user") diff --git a/svc-api/middleware/middleware.go b/svc-api/middleware/middleware.go index 9b9973bfb..95fcee20d 100644 --- a/svc-api/middleware/middleware.go +++ b/svc-api/middleware/middleware.go @@ -16,9 +16,9 @@ package middleware import ( + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/svc-api/rpc" iris "github.com/kataras/iris/v12" - log "github.com/sirupsen/logrus" ) //SessionDelMiddleware is used to delete session created for basic auth diff --git a/svc-api/models/registries.go b/svc-api/models/registries.go index bd3bacb3d..9632a2ea5 100644 --- a/svc-api/models/registries.go +++ b/svc-api/models/registries.go @@ -17,9 +17,10 @@ package models import ( "encoding/json" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" ) //GetRegistryFile fetches a resource from database using table and key diff --git a/svc-api/ratelimiter/ratelimiter.go b/svc-api/ratelimiter/ratelimiter.go index 3a26a97ac..9443acaa4 100644 --- a/svc-api/ratelimiter/ratelimiter.go +++ b/svc-api/ratelimiter/ratelimiter.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" iris "github.com/kataras/iris/v12" - log "github.com/sirupsen/logrus" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-api/router/router.go b/svc-api/router/router.go index 8ab70254b..da29677d1 100755 --- a/svc-api/router/router.go +++ b/svc-api/router/router.go @@ -27,6 +27,7 @@ import ( "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" customLogs "github.com/ODIM-Project/ODIM/lib-utilities/logs" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/response" srv "github.com/ODIM-Project/ODIM/lib-utilities/services" "github.com/ODIM-Project/ODIM/svc-api/handle" @@ -34,7 +35,6 @@ import ( "github.com/ODIM-Project/ODIM/svc-api/ratelimiter" "github.com/ODIM-Project/ODIM/svc-api/rpc" "github.com/kataras/iris/v12" - log "github.com/sirupsen/logrus" ) //Router method to register API handlers. @@ -727,4 +727,4 @@ func Router() *iris.Application { compositionService.Any("/FreePool", handle.CompositionServiceMethodNotAllowed) compositionService.Any("/ActivePool", handle.CompositionServiceMethodNotAllowed) return router -} \ No newline at end of file +} From 25cb71b54be68be09e9a92e7a16f4c226cb197e1 Mon Sep 17 00:00:00 2001 From: Angith Date: Fri, 2 Sep 2022 18:34:44 +0530 Subject: [PATCH 2/9] Logging framework is used in svc-account-session for logging requirements --- .../account-session/templates/deployment.yaml | 8 ++++++++ .../aggregation/templates/deployment.yaml | 8 ++++++++ .../helmcharts/events/templates/deployment.yaml | 8 ++++++++ .../helmcharts/fabrics/templates/deployment.yaml | 8 ++++++++ .../licenses/templates/deployment.yaml | 8 ++++++++ .../managers/templates/deployment.yaml | 8 ++++++++ .../helmcharts/systems/templates/deployment.yaml | 8 ++++++++ .../helmcharts/task/templates/deployment.yaml | 8 ++++++++ .../telemetry/templates/deployment.yaml | 8 ++++++++ .../helmcharts/update/templates/deployment.yaml | 8 ++++++++ svc-account-session/account/create.go | 5 +++-- svc-account-session/account/delete.go | 3 ++- svc-account-session/account/getaccounts.go | 5 +++-- svc-account-session/account/update.go | 5 +++-- svc-account-session/auth/auth.go | 3 ++- svc-account-session/auth/session.go | 3 ++- svc-account-session/main.go | 16 +++++++++++++--- svc-account-session/role/checkprivilege.go | 3 ++- svc-account-session/role/create.go | 3 ++- svc-account-session/role/delete.go | 3 ++- svc-account-session/role/getroles.go | 3 ++- svc-account-session/role/update.go | 3 ++- svc-account-session/rpc/account.go | 3 ++- svc-account-session/rpc/role.go | 3 ++- svc-account-session/session/create.go | 3 ++- svc-account-session/session/delete.go | 3 ++- svc-account-session/session/getsession.go | 2 +- 27 files changed, 127 insertions(+), 22 deletions(-) diff --git a/odim-controller/helmcharts/account-session/templates/deployment.yaml b/odim-controller/helmcharts/account-session/templates/deployment.yaml index 7625965fc..db66514e8 100644 --- a/odim-controller/helmcharts/account-session/templates/deployment.yaml +++ b/odim-controller/helmcharts/account-session/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: account-session:{{ .Values.odimra.accountSessionImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/aggregation/templates/deployment.yaml b/odim-controller/helmcharts/aggregation/templates/deployment.yaml index c65261d59..fa4d88f42 100644 --- a/odim-controller/helmcharts/aggregation/templates/deployment.yaml +++ b/odim-controller/helmcharts/aggregation/templates/deployment.yaml @@ -90,6 +90,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: aggregation:{{ .Values.odimra.aggregationImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/events/templates/deployment.yaml b/odim-controller/helmcharts/events/templates/deployment.yaml index 64eece241..2670220d1 100644 --- a/odim-controller/helmcharts/events/templates/deployment.yaml +++ b/odim-controller/helmcharts/events/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: events:{{ .Values.odimra.eventImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/fabrics/templates/deployment.yaml b/odim-controller/helmcharts/fabrics/templates/deployment.yaml index 20348ca2c..ecc2c1df3 100644 --- a/odim-controller/helmcharts/fabrics/templates/deployment.yaml +++ b/odim-controller/helmcharts/fabrics/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: fabrics:{{ .Values.odimra.fabricsImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/licenses/templates/deployment.yaml b/odim-controller/helmcharts/licenses/templates/deployment.yaml index 40d647f75..0d1631c46 100644 --- a/odim-controller/helmcharts/licenses/templates/deployment.yaml +++ b/odim-controller/helmcharts/licenses/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: licenses:{{ .Values.odimra.licensesImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/managers/templates/deployment.yaml b/odim-controller/helmcharts/managers/templates/deployment.yaml index 52fd51f6b..d6112847a 100644 --- a/odim-controller/helmcharts/managers/templates/deployment.yaml +++ b/odim-controller/helmcharts/managers/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: managers:{{ .Values.odimra.managersImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/systems/templates/deployment.yaml b/odim-controller/helmcharts/systems/templates/deployment.yaml index fe9908b6c..0e62105fb 100644 --- a/odim-controller/helmcharts/systems/templates/deployment.yaml +++ b/odim-controller/helmcharts/systems/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: systems:{{ .Values.odimra.systemsImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/task/templates/deployment.yaml b/odim-controller/helmcharts/task/templates/deployment.yaml index e0cec9db5..ca576cc20 100644 --- a/odim-controller/helmcharts/task/templates/deployment.yaml +++ b/odim-controller/helmcharts/task/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: task:{{ .Values.odimra.taskImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/telemetry/templates/deployment.yaml b/odim-controller/helmcharts/telemetry/templates/deployment.yaml index 215c6d0af..33ba553cf 100644 --- a/odim-controller/helmcharts/telemetry/templates/deployment.yaml +++ b/odim-controller/helmcharts/telemetry/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: telemetry:{{ .Values.odimra.telemetryImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/odim-controller/helmcharts/update/templates/deployment.yaml b/odim-controller/helmcharts/update/templates/deployment.yaml index 1b57ddfee..275c958df 100644 --- a/odim-controller/helmcharts/update/templates/deployment.yaml +++ b/odim-controller/helmcharts/update/templates/deployment.yaml @@ -87,6 +87,14 @@ spec: value: {{ .Values.odimra.haDeploymentEnabled | quote }} - name: ODIM_NAMESPACE value: {{ .Values.odimra.namespace | quote }} + - name: HOST_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name image: update:{{ .Values.odimra.updateImageTag }} imagePullPolicy: IfNotPresent ports: diff --git a/svc-account-session/account/create.go b/svc-account-session/account/create.go index 6c39d2969..16ed6c176 100644 --- a/svc-account-session/account/create.go +++ b/svc-account-session/account/create.go @@ -22,12 +22,13 @@ import ( "encoding/base64" "encoding/json" "fmt" - log "github.com/sirupsen/logrus" - "golang.org/x/crypto/sha3" "net/http" "regexp" "strings" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "golang.org/x/crypto/sha3" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" diff --git a/svc-account-session/account/delete.go b/svc-account-session/account/delete.go index eec3059dd..021e5ffa6 100644 --- a/svc-account-session/account/delete.go +++ b/svc-account-session/account/delete.go @@ -19,9 +19,10 @@ package account // IMPORT Section // --------------------------------------------------------------------------------------- import ( - log "github.com/sirupsen/logrus" "net/http" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" "github.com/ODIM-Project/ODIM/lib-utilities/response" diff --git a/svc-account-session/account/getaccounts.go b/svc-account-session/account/getaccounts.go index a5ef5ab78..84d7df07c 100644 --- a/svc-account-session/account/getaccounts.go +++ b/svc-account-session/account/getaccounts.go @@ -19,15 +19,16 @@ package account // IMPORT Section // --------------------------------------------------------------------------------------- import ( + "net/http" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-account-session/asmodel" "github.com/ODIM-Project/ODIM/svc-account-session/asresponse" "github.com/ODIM-Project/ODIM/svc-account-session/auth" - log "github.com/sirupsen/logrus" - "net/http" ) // GetAllAccounts defines the admin functionality of listing of all accounts. diff --git a/svc-account-session/account/update.go b/svc-account-session/account/update.go index 989e5f69c..8e8fec8d3 100644 --- a/svc-account-session/account/update.go +++ b/svc-account-session/account/update.go @@ -21,16 +21,17 @@ package account import ( "encoding/base64" "encoding/json" + "net/http" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" accountproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/account" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-account-session/asmodel" "github.com/ODIM-Project/ODIM/svc-account-session/asresponse" "github.com/ODIM-Project/ODIM/svc-account-session/auth" - log "github.com/sirupsen/logrus" "golang.org/x/crypto/sha3" - "net/http" ) // Update defines the updation of the account details. Every account details can be diff --git a/svc-account-session/auth/auth.go b/svc-account-session/auth/auth.go index 52b3ad89e..c15a12224 100644 --- a/svc-account-session/auth/auth.go +++ b/svc-account-session/auth/auth.go @@ -16,10 +16,11 @@ package auth import ( - log "github.com/sirupsen/logrus" "net/http" "time" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + customLogs "github.com/ODIM-Project/ODIM/lib-utilities/logs" authproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/auth" "github.com/ODIM-Project/ODIM/lib-utilities/response" diff --git a/svc-account-session/auth/session.go b/svc-account-session/auth/session.go index 0a83d0fa2..30ec18cde 100644 --- a/svc-account-session/auth/session.go +++ b/svc-account-session/auth/session.go @@ -17,10 +17,11 @@ package auth import ( "encoding/base64" - log "github.com/sirupsen/logrus" "sync" "time" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" "github.com/ODIM-Project/ODIM/svc-account-session/asmodel" diff --git a/svc-account-session/main.go b/svc-account-session/main.go index 76107cdb4..7c8351b40 100644 --- a/svc-account-session/main.go +++ b/svc-account-session/main.go @@ -14,9 +14,11 @@ package main import ( - "github.com/sirupsen/logrus" + "fmt" "os" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" accountproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/account" @@ -27,9 +29,17 @@ import ( "github.com/ODIM-Project/ODIM/svc-account-session/rpc" ) -var log = logrus.New() - func main() { + // setting up the logging framework + hostname := os.Getenv("HOST_NAME") + podname := os.Getenv("POD_NAME") + pid := os.Getpid() + c := &log.Config{ + LogFormat: log.SysLogFormat, + Host: hostname, + ProcID: podname + fmt.Sprintf("_%d", pid), + } + log.InitLogger(c) // verifying the uid of the user if uid := os.Geteuid(); uid == 0 { log.Fatal("AccountSession Service should not be run as the root user") diff --git a/svc-account-session/role/checkprivilege.go b/svc-account-session/role/checkprivilege.go index dae6e654f..d71597044 100644 --- a/svc-account-session/role/checkprivilege.go +++ b/svc-account-session/role/checkprivilege.go @@ -17,9 +17,10 @@ package role import ( "fmt" - log "github.com/sirupsen/logrus" "net/http" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-account-session/asmodel" ) diff --git a/svc-account-session/role/create.go b/svc-account-session/role/create.go index a1119b2f7..e3a4a76e3 100644 --- a/svc-account-session/role/create.go +++ b/svc-account-session/role/create.go @@ -17,10 +17,11 @@ package role import ( "encoding/json" - log "github.com/sirupsen/logrus" "net/http" "strings" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" roleproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/role" diff --git a/svc-account-session/role/delete.go b/svc-account-session/role/delete.go index 95858d4ad..cb9855007 100644 --- a/svc-account-session/role/delete.go +++ b/svc-account-session/role/delete.go @@ -25,8 +25,9 @@ import ( "github.com/ODIM-Project/ODIM/svc-account-session/auth" "github.com/ODIM-Project/ODIM/svc-account-session/session" - log "github.com/sirupsen/logrus" "net/http" + + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" ) func doSessionAuthAndUpdate(resp *response.RPC, sessionToken string) (*asmodel.Session, error) { diff --git a/svc-account-session/role/getroles.go b/svc-account-session/role/getroles.go index a126211f6..455abfe24 100644 --- a/svc-account-session/role/getroles.go +++ b/svc-account-session/role/getroles.go @@ -16,9 +16,10 @@ package role import ( - log "github.com/sirupsen/logrus" "net/http" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" diff --git a/svc-account-session/role/update.go b/svc-account-session/role/update.go index 5f106e4b3..a6b74aef7 100644 --- a/svc-account-session/role/update.go +++ b/svc-account-session/role/update.go @@ -17,10 +17,11 @@ package role import ( "encoding/json" - log "github.com/sirupsen/logrus" "net/http" "reflect" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" roleproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/role" "github.com/ODIM-Project/ODIM/lib-utilities/response" diff --git a/svc-account-session/rpc/account.go b/svc-account-session/rpc/account.go index 6a531e0e6..818b28e9b 100644 --- a/svc-account-session/rpc/account.go +++ b/svc-account-session/rpc/account.go @@ -19,9 +19,10 @@ import ( "context" "encoding/json" "fmt" - log "github.com/sirupsen/logrus" "net/http" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" accountproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/account" diff --git a/svc-account-session/rpc/role.go b/svc-account-session/rpc/role.go index 3ebeb3cc6..70a6ba891 100644 --- a/svc-account-session/rpc/role.go +++ b/svc-account-session/rpc/role.go @@ -19,9 +19,10 @@ package rpc import ( "context" "encoding/json" - log "github.com/sirupsen/logrus" "net/http" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" roleproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/role" diff --git a/svc-account-session/session/create.go b/svc-account-session/session/create.go index c05a4785a..8e6c24594 100644 --- a/svc-account-session/session/create.go +++ b/svc-account-session/session/create.go @@ -18,17 +18,18 @@ package session import ( "encoding/json" "fmt" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" customLogs "github.com/ODIM-Project/ODIM/lib-utilities/logs" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" sessionproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/session" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-account-session/asmodel" "github.com/ODIM-Project/ODIM/svc-account-session/asresponse" "github.com/ODIM-Project/ODIM/svc-account-session/auth" uuid "github.com/satori/go.uuid" - log "github.com/sirupsen/logrus" "net/http" "time" diff --git a/svc-account-session/session/delete.go b/svc-account-session/session/delete.go index 4a1988b38..f79bff4f4 100644 --- a/svc-account-session/session/delete.go +++ b/svc-account-session/session/delete.go @@ -16,9 +16,10 @@ package session import ( - log "github.com/sirupsen/logrus" "net/http" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" sessionproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/session" "github.com/ODIM-Project/ODIM/lib-utilities/response" diff --git a/svc-account-session/session/getsession.go b/svc-account-session/session/getsession.go index 0f4bf75c3..a8de503c3 100644 --- a/svc-account-session/session/getsession.go +++ b/svc-account-session/session/getsession.go @@ -19,7 +19,7 @@ import ( "net/http" "time" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" From be4ce23402101d4262c6d4013899e3e8cff12e44 Mon Sep 17 00:00:00 2001 From: Angith Date: Fri, 2 Sep 2022 18:52:48 +0530 Subject: [PATCH 3/9] Logging framework is used in svc-aggregation for logging requirements --- svc-aggregation/agcommon/common.go | 2 +- svc-aggregation/agmessagebus/publish.go | 2 +- svc-aggregation/agmodel/system.go | 2 +- svc-aggregation/main.go | 16 ++++++++++++---- svc-aggregation/rpc/aggregator.go | 2 +- svc-aggregation/system/addaggregationsource.go | 2 +- svc-aggregation/system/addcompute.go | 2 +- svc-aggregation/system/addplugin.go | 7 ++++--- svc-aggregation/system/aggregate.go | 2 +- svc-aggregation/system/bootorder.go | 3 ++- svc-aggregation/system/common.go | 2 +- svc-aggregation/system/connectionmethods.go | 7 ++++--- .../system/deleteaggregationsource.go | 2 +- svc-aggregation/system/get_resource.go | 2 +- svc-aggregation/system/pluginHealthCheck.go | 2 +- svc-aggregation/system/rediscoverinventory.go | 2 +- svc-aggregation/system/reset.go | 2 +- svc-aggregation/system/update.go | 2 +- 18 files changed, 36 insertions(+), 25 deletions(-) diff --git a/svc-aggregation/agcommon/common.go b/svc-aggregation/agcommon/common.go index e1ef6aadd..92935813c 100644 --- a/svc-aggregation/agcommon/common.go +++ b/svc-aggregation/agcommon/common.go @@ -27,9 +27,9 @@ import ( "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/svc-aggregation/agmodel" uuid "github.com/satori/go.uuid" - log "github.com/sirupsen/logrus" ) // DBInterface hold interface for db functions diff --git a/svc-aggregation/agmessagebus/publish.go b/svc-aggregation/agmessagebus/publish.go index 9c3d1f08f..22e733c80 100644 --- a/svc-aggregation/agmessagebus/publish.go +++ b/svc-aggregation/agmessagebus/publish.go @@ -22,8 +22,8 @@ import ( dc "github.com/ODIM-Project/ODIM/lib-messagebus/datacommunicator" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" uuid "github.com/satori/go.uuid" - log "github.com/sirupsen/logrus" ) //Publish will takes the system id,Event type and publishes the data to message bus diff --git a/svc-aggregation/agmodel/system.go b/svc-aggregation/agmodel/system.go index 9e9ec0684..d9584a807 100644 --- a/svc-aggregation/agmodel/system.go +++ b/svc-aggregation/agmodel/system.go @@ -26,7 +26,7 @@ import ( "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" ) const ( diff --git a/svc-aggregation/main.go b/svc-aggregation/main.go index f94620a67..d5a48de51 100644 --- a/svc-aggregation/main.go +++ b/svc-aggregation/main.go @@ -14,14 +14,14 @@ package main import ( + "fmt" "os" - "github.com/sirupsen/logrus" - dc "github.com/ODIM-Project/ODIM/lib-messagebus/datacommunicator" "github.com/ODIM-Project/ODIM/lib-rest-client/pmbhandle" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" aggregatorproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/aggregator" "github.com/ODIM-Project/ODIM/lib-utilities/services" "github.com/ODIM-Project/ODIM/svc-aggregation/agcommon" @@ -38,9 +38,17 @@ type Schema struct { QueryKeys []string `json:"queryKeys"` } -var log = logrus.New() - func main() { + // setting up the logging framework + hostname := os.Getenv("HOST_NAME") + podname := os.Getenv("POD_NAME") + pid := os.Getpid() + c := &log.Config{ + LogFormat: log.SysLogFormat, + Host: hostname, + ProcID: podname + fmt.Sprintf("_%d", pid), + } + log.InitLogger(c) // verifying the uid of the user if uid := os.Geteuid(); uid == 0 { log.Fatal("Aggregation Service should not be run as the root user") diff --git a/svc-aggregation/rpc/aggregator.go b/svc-aggregation/rpc/aggregator.go index 265d50a6f..fc2a74f5d 100644 --- a/svc-aggregation/rpc/aggregator.go +++ b/svc-aggregation/rpc/aggregator.go @@ -24,7 +24,7 @@ import ( "strings" "time" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-aggregation/system/addaggregationsource.go b/svc-aggregation/system/addaggregationsource.go index 609b16256..3e3119059 100644 --- a/svc-aggregation/system/addaggregationsource.go +++ b/svc-aggregation/system/addaggregationsource.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" aggregatorproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/aggregator" diff --git a/svc-aggregation/system/addcompute.go b/svc-aggregation/system/addcompute.go index 4b6cd4b63..c3cc7ae99 100644 --- a/svc-aggregation/system/addcompute.go +++ b/svc-aggregation/system/addcompute.go @@ -20,7 +20,7 @@ import ( "net/http" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-aggregation/system/addplugin.go b/svc-aggregation/system/addplugin.go index fdd7fdf15..29435e44a 100644 --- a/svc-aggregation/system/addplugin.go +++ b/svc-aggregation/system/addplugin.go @@ -17,17 +17,18 @@ package system import ( "encoding/json" "fmt" + "net/http" + "strings" + "github.com/ODIM-Project/ODIM/lib-dmtf/model" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-aggregation/agcommon" "github.com/ODIM-Project/ODIM/svc-aggregation/agmodel" "github.com/ODIM-Project/ODIM/svc-aggregation/agresponse" - log "github.com/sirupsen/logrus" - "net/http" - "strings" ) func (e *ExternalInterface) addPluginData(req AddResourceRequest, taskID, targetURI string, pluginContactRequest getResourceRequest, queueList []string, cmVariants connectionMethodVariants) (response.RPC, string, []byte) { diff --git a/svc-aggregation/system/aggregate.go b/svc-aggregation/system/aggregate.go index b2ac52b17..472aaace7 100644 --- a/svc-aggregation/system/aggregate.go +++ b/svc-aggregation/system/aggregate.go @@ -26,7 +26,7 @@ import ( "sync" "time" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-aggregation/system/bootorder.go b/svc-aggregation/system/bootorder.go index 695a79a23..b1336ec05 100644 --- a/svc-aggregation/system/bootorder.go +++ b/svc-aggregation/system/bootorder.go @@ -18,12 +18,13 @@ package system import ( "encoding/json" "fmt" - log "github.com/sirupsen/logrus" "net/http" "runtime" "strings" "sync" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + "github.com/ODIM-Project/ODIM/lib-utilities/common" aggregatorproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/aggregator" "github.com/ODIM-Project/ODIM/lib-utilities/response" diff --git a/svc-aggregation/system/common.go b/svc-aggregation/system/common.go index 4bf7b1f75..c3d71079f 100644 --- a/svc-aggregation/system/common.go +++ b/svc-aggregation/system/common.go @@ -28,7 +28,7 @@ import ( "sync" "time" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" dmtf "github.com/ODIM-Project/ODIM/lib-dmtf/model" "github.com/ODIM-Project/ODIM/lib-utilities/common" diff --git a/svc-aggregation/system/connectionmethods.go b/svc-aggregation/system/connectionmethods.go index 6e1198d0f..6f06a5e45 100644 --- a/svc-aggregation/system/connectionmethods.go +++ b/svc-aggregation/system/connectionmethods.go @@ -15,16 +15,17 @@ package system import ( + "net/http" + "strings" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" aggregatorproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/aggregator" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-aggregation/agmodel" "github.com/ODIM-Project/ODIM/svc-aggregation/agresponse" - log "github.com/sirupsen/logrus" - "net/http" - "strings" ) // GetAllConnectionMethods is the handler for getting the connection methods collection diff --git a/svc-aggregation/system/deleteaggregationsource.go b/svc-aggregation/system/deleteaggregationsource.go index f19b9d5f8..4e0ad17be 100644 --- a/svc-aggregation/system/deleteaggregationsource.go +++ b/svc-aggregation/system/deleteaggregationsource.go @@ -21,7 +21,7 @@ import ( "reflect" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" dmtf "github.com/ODIM-Project/ODIM/lib-dmtf/model" "github.com/ODIM-Project/ODIM/lib-utilities/common" diff --git a/svc-aggregation/system/get_resource.go b/svc-aggregation/system/get_resource.go index e3296c3db..ba6fda34f 100644 --- a/svc-aggregation/system/get_resource.go +++ b/svc-aggregation/system/get_resource.go @@ -15,7 +15,7 @@ import ( "net/http" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-aggregation/system/pluginHealthCheck.go b/svc-aggregation/system/pluginHealthCheck.go index 9bcf737e0..cb118a18f 100644 --- a/svc-aggregation/system/pluginHealthCheck.go +++ b/svc-aggregation/system/pluginHealthCheck.go @@ -24,11 +24,11 @@ import ( "time" "github.com/ODIM-Project/ODIM/lib-utilities/common" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" aggregatorproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/aggregator" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-aggregation/agcommon" "github.com/ODIM-Project/ODIM/svc-aggregation/agmodel" - log "github.com/sirupsen/logrus" ) var ( diff --git a/svc-aggregation/system/rediscoverinventory.go b/svc-aggregation/system/rediscoverinventory.go index 0f1b17e0e..19b83c07a 100644 --- a/svc-aggregation/system/rediscoverinventory.go +++ b/svc-aggregation/system/rediscoverinventory.go @@ -21,7 +21,7 @@ import ( "net/http" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-aggregation/system/reset.go b/svc-aggregation/system/reset.go index 1bd09d60a..7a9b8cd13 100644 --- a/svc-aggregation/system/reset.go +++ b/svc-aggregation/system/reset.go @@ -23,7 +23,7 @@ import ( "sync" "time" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" diff --git a/svc-aggregation/system/update.go b/svc-aggregation/system/update.go index 33e64862e..6788755b7 100644 --- a/svc-aggregation/system/update.go +++ b/svc-aggregation/system/update.go @@ -21,7 +21,7 @@ import ( "net/http" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" From b994209f6df5d56082dc8f55c1d0bcd289c8e996 Mon Sep 17 00:00:00 2001 From: Angith Date: Fri, 2 Sep 2022 20:23:17 +0530 Subject: [PATCH 4/9] Logging framework is in svc-events for logging requirements --- svc-events/consumer/consumer.go | 2 +- svc-events/evcommon/common.go | 2 +- svc-events/evcommon/common_test.go | 2 +- svc-events/events/common.go | 2 +- svc-events/events/deletesubscription.go | 2 +- svc-events/events/evtsubscription.go | 2 +- svc-events/events/publishevttosubscriber.go | 2 +- svc-events/events/submittestevent.go | 2 +- svc-events/evmodel/events.go | 2 +- svc-events/main.go | 15 ++++++++++++--- svc-events/rpc/events.go | 2 +- 11 files changed, 22 insertions(+), 13 deletions(-) diff --git a/svc-events/consumer/consumer.go b/svc-events/consumer/consumer.go index 55eece628..3fcddbec8 100644 --- a/svc-events/consumer/consumer.go +++ b/svc-events/consumer/consumer.go @@ -24,7 +24,7 @@ import ( dc "github.com/ODIM-Project/ODIM/lib-messagebus/datacommunicator" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" ) var ( diff --git a/svc-events/evcommon/common.go b/svc-events/evcommon/common.go index 9fc46fd54..5e13a30ab 100644 --- a/svc-events/evcommon/common.go +++ b/svc-events/evcommon/common.go @@ -26,7 +26,7 @@ import ( "sync" "time" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-rest-client/pmbhandle" "github.com/ODIM-Project/ODIM/lib-utilities/common" diff --git a/svc-events/evcommon/common_test.go b/svc-events/evcommon/common_test.go index a9104558e..1faf8b352 100644 --- a/svc-events/evcommon/common_test.go +++ b/svc-events/evcommon/common_test.go @@ -25,7 +25,7 @@ import ( "reflect" "testing" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-events/events/common.go b/svc-events/events/common.go index 5ddeac122..10b85030e 100644 --- a/svc-events/events/common.go +++ b/svc-events/events/common.go @@ -19,6 +19,7 @@ import ( "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" taskproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/task" "github.com/ODIM-Project/ODIM/lib-utilities/response" errResponse "github.com/ODIM-Project/ODIM/lib-utilities/response" @@ -26,7 +27,6 @@ import ( "github.com/ODIM-Project/ODIM/svc-events/evcommon" "github.com/ODIM-Project/ODIM/svc-events/evmodel" "github.com/ODIM-Project/ODIM/svc-events/evresponse" - log "github.com/sirupsen/logrus" "gopkg.in/go-playground/validator.v9" ) diff --git a/svc-events/events/deletesubscription.go b/svc-events/events/deletesubscription.go index 18daf299a..e30bf467b 100644 --- a/svc-events/events/deletesubscription.go +++ b/svc-events/events/deletesubscription.go @@ -31,7 +31,7 @@ import ( aggregatorproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/aggregator" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-events/events/evtsubscription.go b/svc-events/events/evtsubscription.go index d97ddf25e..42d80d54f 100644 --- a/svc-events/events/evtsubscription.go +++ b/svc-events/events/evtsubscription.go @@ -31,7 +31,7 @@ import ( "strings" "sync" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-events/events/publishevttosubscriber.go b/svc-events/events/publishevttosubscriber.go index 03de51019..241115b91 100644 --- a/svc-events/events/publishevttosubscriber.go +++ b/svc-events/events/publishevttosubscriber.go @@ -31,7 +31,7 @@ import ( "strings" "time" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-events/events/submittestevent.go b/svc-events/events/submittestevent.go index 061828923..a87ca2519 100644 --- a/svc-events/events/submittestevent.go +++ b/svc-events/events/submittestevent.go @@ -27,8 +27,8 @@ import ( "net/http" "time" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" uuid "github.com/satori/go.uuid" - log "github.com/sirupsen/logrus" "github.com/ODIM-Project/ODIM/lib-utilities/common" eventsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/events" diff --git a/svc-events/evmodel/events.go b/svc-events/evmodel/events.go index 580c461e5..6453fdd55 100644 --- a/svc-events/evmodel/events.go +++ b/svc-events/evmodel/events.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/errors" diff --git a/svc-events/main.go b/svc-events/main.go index 572afc72a..0c7fe624c 100644 --- a/svc-events/main.go +++ b/svc-events/main.go @@ -14,22 +14,31 @@ package main import ( + "fmt" "os" dc "github.com/ODIM-Project/ODIM/lib-messagebus/datacommunicator" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" eventsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/events" "github.com/ODIM-Project/ODIM/lib-utilities/services" "github.com/ODIM-Project/ODIM/svc-events/consumer" "github.com/ODIM-Project/ODIM/svc-events/evcommon" "github.com/ODIM-Project/ODIM/svc-events/rpc" - "github.com/sirupsen/logrus" ) -var log = logrus.New() - func main() { + // setting up the logging framework + hostname := os.Getenv("HOST_NAME") + podname := os.Getenv("POD_NAME") + pid := os.Getpid() + c := &log.Config{ + LogFormat: log.SysLogFormat, + Host: hostname, + ProcID: podname + fmt.Sprintf("_%d", pid), + } + log.InitLogger(c) // verifying the uid of the user if uid := os.Geteuid(); uid == 0 { log.Fatal("Event Service should not be run as the root user") diff --git a/svc-events/rpc/events.go b/svc-events/rpc/events.go index 23a8aefff..25bf56f97 100644 --- a/svc-events/rpc/events.go +++ b/svc-events/rpc/events.go @@ -22,7 +22,7 @@ import ( "net/http" "strings" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-rest-client/pmbhandle" "github.com/ODIM-Project/ODIM/lib-utilities/common" From f7feca54dff3fc21022e256e1542660f3e7336ef Mon Sep 17 00:00:00 2001 From: Angith Date: Sat, 3 Sep 2022 19:21:13 +0530 Subject: [PATCH 5/9] Logging framework is used in svc-fabrics for logging requirements --- svc-fabrics/fabrics/addfabric.go | 2 +- svc-fabrics/fabrics/common.go | 9 +++++---- svc-fabrics/fabrics/removefabric.go | 2 +- svc-fabrics/main.go | 16 ++++++++++++---- svc-fabrics/rpc/fabrics.go | 2 +- 5 files changed, 20 insertions(+), 11 deletions(-) diff --git a/svc-fabrics/fabrics/addfabric.go b/svc-fabrics/fabrics/addfabric.go index a51a30096..579cec342 100644 --- a/svc-fabrics/fabrics/addfabric.go +++ b/svc-fabrics/fabrics/addfabric.go @@ -22,10 +22,10 @@ import ( "strings" "github.com/ODIM-Project/ODIM/lib-utilities/common" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" fabricsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/fabrics" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-fabrics/fabmodel" - log "github.com/sirupsen/logrus" ) //AddFabric holds the logic for Adding fabric diff --git a/svc-fabrics/fabrics/common.go b/svc-fabrics/fabrics/common.go index 39823de8c..fd8f1c124 100644 --- a/svc-fabrics/fabrics/common.go +++ b/svc-fabrics/fabrics/common.go @@ -18,16 +18,17 @@ package fabrics import ( "encoding/json" "fmt" - dmtf "github.com/ODIM-Project/ODIM/lib-dmtf/model" - fabricsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/fabrics" - "github.com/ODIM-Project/ODIM/svc-fabrics/fabresponse" - log "github.com/sirupsen/logrus" "io/ioutil" "net/http" "strconv" "strings" "sync" + dmtf "github.com/ODIM-Project/ODIM/lib-dmtf/model" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" + fabricsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/fabrics" + "github.com/ODIM-Project/ODIM/svc-fabrics/fabresponse" + "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/response" diff --git a/svc-fabrics/fabrics/removefabric.go b/svc-fabrics/fabrics/removefabric.go index 04b0e55d4..a18563fc6 100644 --- a/svc-fabrics/fabrics/removefabric.go +++ b/svc-fabrics/fabrics/removefabric.go @@ -20,10 +20,10 @@ import ( "strings" "github.com/ODIM-Project/ODIM/lib-utilities/common" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" fabricsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/fabrics" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-fabrics/fabmodel" - log "github.com/sirupsen/logrus" ) // RemoveFabric holds the logic for deleting specfic fabric resource diff --git a/svc-fabrics/main.go b/svc-fabrics/main.go index eeeb1e64f..8ab8d34ef 100644 --- a/svc-fabrics/main.go +++ b/svc-fabrics/main.go @@ -14,22 +14,30 @@ package main import ( + "fmt" "os" - "github.com/sirupsen/logrus" - "github.com/ODIM-Project/ODIM/lib-rest-client/pmbhandle" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" fabricsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/fabrics" "github.com/ODIM-Project/ODIM/lib-utilities/services" "github.com/ODIM-Project/ODIM/svc-fabrics/fabrics" "github.com/ODIM-Project/ODIM/svc-fabrics/rpc" ) -var log = logrus.New() - func main() { + // setting up the logging framework + hostname := os.Getenv("HOST_NAME") + podname := os.Getenv("POD_NAME") + pid := os.Getpid() + c := &log.Config{ + LogFormat: log.SysLogFormat, + Host: hostname, + ProcID: podname + fmt.Sprintf("_%d", pid), + } + log.InitLogger(c) // verifying the uid of the user if uid := os.Geteuid(); uid == 0 { diff --git a/svc-fabrics/rpc/fabrics.go b/svc-fabrics/rpc/fabrics.go index 1c8d17f60..a63d2f60f 100644 --- a/svc-fabrics/rpc/fabrics.go +++ b/svc-fabrics/rpc/fabrics.go @@ -21,7 +21,7 @@ import ( "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" fabricsproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/fabrics" "github.com/ODIM-Project/ODIM/lib-utilities/response" From fcd6177d3dcc1a80bed69caa6b43f2bdfadce378 Mon Sep 17 00:00:00 2001 From: Angith Date: Sat, 3 Sep 2022 19:41:44 +0530 Subject: [PATCH 6/9] Logging framework is used in svc-licences for logging requirements --- svc-licenses/lcommon/common.go | 2 +- svc-licenses/licenses/licenses.go | 4 ++-- svc-licenses/main.go | 17 +++++++++++++---- svc-licenses/rpc/common.go | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/svc-licenses/lcommon/common.go b/svc-licenses/lcommon/common.go index c3bb2f8d3..8260ba5b7 100644 --- a/svc-licenses/lcommon/common.go +++ b/svc-licenses/lcommon/common.go @@ -29,7 +29,7 @@ import ( "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-licenses/model" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" ) //GetAllKeysFromTable fetches all keys in a given table diff --git a/svc-licenses/licenses/licenses.go b/svc-licenses/licenses/licenses.go index aff0ae4b4..219bfc040 100644 --- a/svc-licenses/licenses/licenses.go +++ b/svc-licenses/licenses/licenses.go @@ -28,7 +28,7 @@ import ( lcommon "github.com/ODIM-Project/ODIM/svc-licenses/lcommon" "github.com/ODIM-Project/ODIM/svc-licenses/model" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" ) var ( @@ -141,7 +141,7 @@ func (e *ExternalInterface) InstallLicenseService(req *licenseproto.InstallLicen } else if len(installreq.Links.Link) == 0 { errMsg := "Invalid request, mandatory field AuthorizedDevices links is missing" log.Error(errMsg) - return common.GeneralError(http.StatusBadRequest, response.PropertyMissing, errMsg, []interface{}{"LicenseString"}, nil) + return common.GeneralError(http.StatusBadRequest, response.PropertyMissing, errMsg, []interface{}{"LicenseString"}, nil) } var serverURI string diff --git a/svc-licenses/main.go b/svc-licenses/main.go index 80fac6264..f1ac68cff 100644 --- a/svc-licenses/main.go +++ b/svc-licenses/main.go @@ -15,20 +15,29 @@ package main import ( + "fmt" "os" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" licenseproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/licenses" "github.com/ODIM-Project/ODIM/lib-utilities/services" "github.com/ODIM-Project/ODIM/svc-licenses/rpc" - - "github.com/sirupsen/logrus" ) -var log = logrus.New() - func main() { + // setting up the logging framework + hostname := os.Getenv("HOST_NAME") + podname := os.Getenv("POD_NAME") + pid := os.Getpid() + c := &log.Config{ + LogFormat: log.SysLogFormat, + Host: hostname, + ProcID: podname + fmt.Sprintf("_%d", pid), + } + log.InitLogger(c) + if uid := os.Geteuid(); uid == 0 { log.Error("Licenses Service should not be run as the root user") } diff --git a/svc-licenses/rpc/common.go b/svc-licenses/rpc/common.go index 8e1967e5d..b52eaf336 100644 --- a/svc-licenses/rpc/common.go +++ b/svc-licenses/rpc/common.go @@ -21,7 +21,7 @@ import ( "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-licenses/licenses" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" ) // Licenses struct helps to register service From c7161acc33751788ee7fa10b215ef04a56e1b87b Mon Sep 17 00:00:00 2001 From: Angith Date: Sat, 3 Sep 2022 20:08:38 +0530 Subject: [PATCH 7/9] Logging framework is used in svc-managers for logging requirements --- svc-managers/main.go | 15 +++++++++++---- svc-managers/managers/managers.go | 2 +- svc-managers/mgrcommon/common.go | 2 +- svc-managers/rpc/manager.go | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/svc-managers/main.go b/svc-managers/main.go index 1e341562e..fbbb24860 100644 --- a/svc-managers/main.go +++ b/svc-managers/main.go @@ -17,13 +17,12 @@ import ( "encoding/json" "os" - "github.com/sirupsen/logrus" - "fmt" dmtf "github.com/ODIM-Project/ODIM/lib-dmtf/model" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" managersproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/managers" "github.com/ODIM-Project/ODIM/lib-utilities/services" "github.com/ODIM-Project/ODIM/svc-managers/managers" @@ -32,9 +31,17 @@ import ( "github.com/ODIM-Project/ODIM/svc-managers/rpc" ) -var log = logrus.New() - func main() { + // setting up the logging framework + hostname := os.Getenv("HOST_NAME") + podname := os.Getenv("POD_NAME") + pid := os.Getpid() + c := &log.Config{ + LogFormat: log.SysLogFormat, + Host: hostname, + ProcID: podname + fmt.Sprintf("_%d", pid), + } + log.InitLogger(c) // verifying the uid of the user if uid := os.Geteuid(); uid == 0 { diff --git a/svc-managers/managers/managers.go b/svc-managers/managers/managers.go index 39360f7b1..ec830b0b3 100644 --- a/svc-managers/managers/managers.go +++ b/svc-managers/managers/managers.go @@ -27,12 +27,12 @@ import ( "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" "github.com/ODIM-Project/ODIM/lib-utilities/errors" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" managersproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/managers" "github.com/ODIM-Project/ODIM/lib-utilities/response" "github.com/ODIM-Project/ODIM/svc-managers/mgrcommon" "github.com/ODIM-Project/ODIM/svc-managers/mgrmodel" "github.com/ODIM-Project/ODIM/svc-managers/mgrresponse" - log "github.com/sirupsen/logrus" "gopkg.in/go-playground/validator.v9" ) diff --git a/svc-managers/mgrcommon/common.go b/svc-managers/mgrcommon/common.go index bc57bd89a..2d28bb48f 100644 --- a/svc-managers/mgrcommon/common.go +++ b/svc-managers/mgrcommon/common.go @@ -23,7 +23,7 @@ import ( "strings" "sync" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" "github.com/ODIM-Project/ODIM/lib-utilities/config" diff --git a/svc-managers/rpc/manager.go b/svc-managers/rpc/manager.go index 12db71a36..c576a4265 100644 --- a/svc-managers/rpc/manager.go +++ b/svc-managers/rpc/manager.go @@ -19,7 +19,7 @@ import ( "encoding/json" "net/http" - log "github.com/sirupsen/logrus" + log "github.com/ODIM-Project/ODIM/lib-utilities/logs" "github.com/ODIM-Project/ODIM/lib-utilities/common" managersproto "github.com/ODIM-Project/ODIM/lib-utilities/proto/managers" From 89b592c56f7699e1d140c25db1914c8acea37880 Mon Sep 17 00:00:00 2001 From: Angith Date: Mon, 5 Sep 2022 09:42:53 +0530 Subject: [PATCH 8/9] typo fixed --- lib-utilities/logs/logger.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lib-utilities/logs/logger.go b/lib-utilities/logs/logger.go index 6c2cac1af..ba19fd0e2 100644 --- a/lib-utilities/logs/logger.go +++ b/lib-utilities/logs/logger.go @@ -201,44 +201,44 @@ func Panicln(args ...interface{}) { Logger.Panicln(args...) } -// TraceWithFileds calls Trace method on package level after appending the fields passed -func TraceWithFileds(fields map[string]interface{}, args ...interface{}) { +// TraceWithFields calls Trace method on package level after appending the fields passed +func TraceWithFields(fields map[string]interface{}, args ...interface{}) { data := getFields(fields) Logger.WithFields(data).Trace(args...) } -// DebugWithFileds calls Debug method on package level after appending the fields passed -func DebugWithFileds(fields map[string]interface{}, args ...interface{}) { +// DebugWithFields calls Debug method on package level after appending the fields passed +func DebugWithFields(fields map[string]interface{}, args ...interface{}) { data := getFields(fields) Logger.WithFields(data).Debug(args...) } -// InfoWithFileds calls Info method on package level after appending the fields passed -func InfoWithFileds(fields map[string]interface{}, args ...interface{}) { +// InfoWithFields calls Info method on package level after appending the fields passed +func InfoWithFields(fields map[string]interface{}, args ...interface{}) { data := getFields(fields) Logger.WithFields(data).Info(args...) } -// PrintWithFileds calls Info method on package level after appending the fields passed -func PrintWithFileds(fields map[string]interface{}, args ...interface{}) { +// PrintWithFields calls Info method on package level after appending the fields passed +func PrintWithFields(fields map[string]interface{}, args ...interface{}) { data := getFields(fields) Logger.WithFields(data).Info(args...) } -// WarnWithFileds calls Warn method on package level after appending the fields passed -func WarnWithFileds(fields map[string]interface{}, args ...interface{}) { +// WarnWithFields calls Warn method on package level after appending the fields passed +func WarnWithFields(fields map[string]interface{}, args ...interface{}) { data := getFields(fields) Logger.WithFields(data).Warn(args...) } -// ErrorWithFileds calls Error method on package level after appending the fields passed -func ErrorWithFileds(fields map[string]interface{}, args ...interface{}) { +// ErrorWithFields calls Error method on package level after appending the fields passed +func ErrorWithFields(fields map[string]interface{}, args ...interface{}) { data := getFields(fields) Logger.WithFields(data).Error(args...) } -// PanicWithFileds calls Panic method on package level after appending the fields passed -func PanicWithFileds(fields map[string]interface{}, args ...interface{}) { +// PanicWithFields calls Panic method on package level after appending the fields passed +func PanicWithFields(fields map[string]interface{}, args ...interface{}) { data := getFields(fields) Logger.WithFields(data).Panic(args...) } From ebc0ee32d36bd43fb93ea6d3585c6eb7be92f539 Mon Sep 17 00:00:00 2001 From: Angith Date: Mon, 5 Sep 2022 11:42:23 +0530 Subject: [PATCH 9/9] logger variable is initilized on the initial startup of the logging framework --- lib-utilities/logs/logger.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib-utilities/logs/logger.go b/lib-utilities/logs/logger.go index ba19fd0e2..36bdcd5c1 100644 --- a/lib-utilities/logs/logger.go +++ b/lib-utilities/logs/logger.go @@ -40,9 +40,12 @@ type Config struct { ProcID string } +func init() { + Logger = logrus.NewEntry(logrus.New()) +} + // InitLogger sets up the Logger and sets up the format and level func InitLogger(c *Config) { - Logger = logrus.NewEntry(logrus.New()) // setting logger format switch c.LogFormat {