X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fconfig%2Fconfig.go;h=dfd2505b6c38d0fd886cab4c36e7cdc150749279;hb=f1cee0f81c6bc482f73182c8f4c903e8376381e8;hp=764e89c294f454b34a1240bbcfb9cf09cdc4d430;hpb=64654a9b0e63b7e36249bef4f542cdf7fac56020;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/config/config.go b/dmaap-mediator-producer/internal/config/config.go
index 764e89c2..dfd2505b 100644
--- a/dmaap-mediator-producer/internal/config/config.go
+++ b/dmaap-mediator-producer/internal/config/config.go
@@ -22,31 +22,28 @@ package config
 
 import (
 	"os"
+	"strconv"
+
+	log "github.com/sirupsen/logrus"
 )
 
 type Config struct {
-	LogLevel                            string
-	InfoProducerSupervisionCallbackHost string
-	InfoProducerSupervisionCallbackPort string
-	InfoJobCallbackHost                 string
-	InfoJobCallbackPort                 string
-	InfoCoordinatorAddress              string
-}
-
-type ProducerRegistrationInfo struct {
-	InfoProducerSupervisionCallbackUrl string   `json:"info_producer_supervision_callback_url"`
-	SupportedInfoTypes                 []string `json:"supported_info_types"`
-	InfoJobCallbackUrl                 string   `json:"info_job_callback_url"`
+	LogLevel               log.Level
+	InfoProducerHost       string
+	InfoProducerPort       int
+	InfoCoordinatorAddress string
+	MRHost                 string
+	MRPort                 int
 }
 
 func New() *Config {
 	return &Config{
-		LogLevel:                            getEnv("LOG_LEVEL", "Info"),
-		InfoProducerSupervisionCallbackHost: getEnv("INFO_PRODUCER_SUPERVISION_CALLBACK_HOST", ""),
-		InfoProducerSupervisionCallbackPort: getEnv("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", "8085"),
-		InfoJobCallbackHost:                 getEnv("INFO_JOB_CALLBACK_HOST", ""),
-		InfoJobCallbackPort:                 getEnv("INFO_JOB_CALLBACK_PORT", "8086"),
-		InfoCoordinatorAddress:              getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"),
+		LogLevel:               getLogLevel(),
+		InfoProducerHost:       getEnv("INFO_PRODUCER_HOST", ""),
+		InfoProducerPort:       getEnvAsInt("INFO_PRODUCER_PORT", 8085),
+		InfoCoordinatorAddress: getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"),
+		MRHost:                 getEnv("MR_HOST", "http://message-router.onap"),
+		MRPort:                 getEnvAsInt("MR_PORT", 3904),
 	}
 }
 
@@ -57,3 +54,24 @@ func getEnv(key string, defaultVal string) string {
 
 	return defaultVal
 }
+
+func getEnvAsInt(name string, defaultVal int) int {
+	valueStr := getEnv(name, "")
+	if value, err := strconv.Atoi(valueStr); err == nil {
+		return value
+	} else if valueStr != "" {
+		log.Warnf("Invalid int value: %v for variable: %v. Default value: %v will be used", valueStr, name, defaultVal)
+	}
+
+	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
+	}
+}