Merge "Add docker-compose files for dmaap-mediator"

[nonrtric.git] / dmaap-mediator-producer / internal / config / config.go

diff --git a/dmaap-mediator-producer/internal/config/config.go b/dmaap-mediator-producer/internal/config/config.go
index 764e89c..9b7b1dd 100644 (file)
--- a/dmaap-mediator-producer/internal/config/config.go
+++ b/dmaap-mediator-producer/internal/config/config.go
@@ -22,15 +22,18 @@ 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
+       LogLevel               string
+       InfoProducerHost       string
+       InfoProducerPort       int
+       InfoCoordinatorAddress string
+       MRHost                 string
+       MRPort                 int
 }
 
 type ProducerRegistrationInfo struct {
@@ -41,12 +44,12 @@ type ProducerRegistrationInfo struct {
 
 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:               getEnv("LOG_LEVEL", "Info"),
+               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 +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
+}