Initial job creation

[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 a3e3a11..3616c58 100644 (file)
--- a/dmaap-mediator-producer/internal/config/config.go
+++ b/dmaap-mediator-producer/internal/config/config.go
@@ -22,13 +22,18 @@ package config
 
 import (
        "os"
+       "strconv"
+
+       log "github.com/sirupsen/logrus"
 )
 
 type Config struct {
-       LogLevel                           string
-       InfoJobCallbackUrl                 string
-       InfoCoordinatorAddress             string
-       InfoProducerSupervisionCallbackUrl string
+       LogLevel                            string
+       InfoProducerSupervisionCallbackHost string
+       InfoProducerSupervisionCallbackPort int
+       InfoJobCallbackHost                 string
+       InfoJobCallbackPort                 int
+       InfoCoordinatorAddress              string
 }
 
 type ProducerRegistrationInfo struct {
@@ -39,10 +44,12 @@ type ProducerRegistrationInfo struct {
 
 func New() *Config {
        return &Config{
-               LogLevel:                           getEnv("LOG_LEVEL", "Info"),
-               InfoJobCallbackUrl:                 getEnv("INFO_JOB_CALLBACK_URL", ""),
-               InfoCoordinatorAddress:             getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"),
-               InfoProducerSupervisionCallbackUrl: getEnv("INFO_PRODUCER_SUPERVISION_CALLBACK_URL", ""),
+               LogLevel:                            getEnv("LOG_LEVEL", "Info"),
+               InfoProducerSupervisionCallbackHost: getEnv("INFO_PRODUCER_SUPERVISION_CALLBACK_HOST", ""),
+               InfoProducerSupervisionCallbackPort: getEnvAsInt("INFO_PRODUCER_SUPERVISION_CALLBACK_PORT", 8085),
+               InfoJobCallbackHost:                 getEnv("INFO_JOB_CALLBACK_HOST", ""),
+               InfoJobCallbackPort:                 getEnvAsInt("INFO_JOB_CALLBACK_PORT", 8086),
+               InfoCoordinatorAddress:              getEnv("INFO_COORD_ADDR", "http://enrichmentservice:8083"),
        }
 }
 
@@ -53,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
+}