X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fconfig%2Fconfig.go;fp=dmaap-mediator-producer%2Finternal%2Fconfig%2Fconfig.go;h=dfd2505b6c38d0fd886cab4c36e7cdc150749279;hb=65a53d2388547247222d144b365401056bbdffc5;hp=9b7b1dd1544b184141abe4546a40a3430e09413e;hpb=6ab9cd9df333ab3b5ed1ce6957dcea8f20d5c28d;p=nonrtric.git diff --git a/dmaap-mediator-producer/internal/config/config.go b/dmaap-mediator-producer/internal/config/config.go index 9b7b1dd1..dfd2505b 100644 --- a/dmaap-mediator-producer/internal/config/config.go +++ b/dmaap-mediator-producer/internal/config/config.go @@ -28,7 +28,7 @@ import ( ) type Config struct { - LogLevel string + LogLevel log.Level InfoProducerHost string InfoProducerPort int InfoCoordinatorAddress string @@ -36,15 +36,9 @@ type Config struct { MRPort int } -type ProducerRegistrationInfo struct { - InfoProducerSupervisionCallbackUrl string `json:"info_producer_supervision_callback_url"` - SupportedInfoTypes []string `json:"supported_info_types"` - InfoJobCallbackUrl string `json:"info_job_callback_url"` -} - func New() *Config { return &Config{ - LogLevel: getEnv("LOG_LEVEL", "Info"), + LogLevel: getLogLevel(), InfoProducerHost: getEnv("INFO_PRODUCER_HOST", ""), InfoProducerPort: getEnvAsInt("INFO_PRODUCER_PORT", 8085), InfoCoordinatorAddress: getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"), @@ -71,3 +65,13 @@ func getEnvAsInt(name string, defaultVal int) int { return defaultVal } + +func getLogLevel() log.Level { + logLevelStr := getEnv("LOG_LEVEL", "Info") + if loglevel, err := log.ParseLevel(logLevelStr); err == nil { + return loglevel + } else { + log.Warnf("Invalid log level: %v. Log level will be Info!", logLevelStr) + return log.InfoLevel + } +}