X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fconfig%2Fconfig.go;h=3616c584ae2eca75a5a5cec75961a11f720fc47f;hb=63a42cacf9c52b7dff64431a3354f55c49bd6e4b;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..3616c584 100644
--- a/dmaap-mediator-producer/internal/config/config.go
+++ b/dmaap-mediator-producer/internal/config/config.go
@@ -22,14 +22,17 @@ package config
 
 import (
 	"os"
+	"strconv"
+
+	log "github.com/sirupsen/logrus"
 )
 
 type Config struct {
 	LogLevel                            string
 	InfoProducerSupervisionCallbackHost string
-	InfoProducerSupervisionCallbackPort string
+	InfoProducerSupervisionCallbackPort int
 	InfoJobCallbackHost                 string
-	InfoJobCallbackPort                 string
+	InfoJobCallbackPort                 int
 	InfoCoordinatorAddress              string
 }
 
@@ -43,9 +46,9 @@ 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"),
+		InfoProducerSupervisionCallbackPort: getEnvAsInt("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", 8085),
 		InfoJobCallbackHost:                 getEnv("INFO_JOB_CALLBACK_HOST", ""),
-		InfoJobCallbackPort:                 getEnv("INFO_JOB_CALLBACK_PORT", "8086"),
+		InfoJobCallbackPort:                 getEnvAsInt("INFO_JOB_CALLBACK_PORT", 8086),
 		InfoCoordinatorAddress:              getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"),
 	}
 }
@@ -57,3 +60,14 @@ 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
+}