sync from Azure to LF

[ric-plt/e2mgr.git] / E2Manager / configuration / configuration.go

diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go
index 5bca875..cfba4d2 100644 (file)
--- a/E2Manager/configuration/configuration.go
+++ b/E2Manager/configuration/configuration.go
@@ -34,7 +34,10 @@ type Configuration struct {
                MaxMsgSize int
        }
        NotificationResponseBuffer int
-       BigRedButtonTimeoutSec  int
+       BigRedButtonTimeoutSec     int
+       MaxConnectionAttempts      int
+       MaxRnibConnectionAttempts  int
+       RnibRetryIntervalMs                int
 }
 
 func ParseConfiguration() *Configuration{
@@ -43,9 +46,10 @@ func ParseConfiguration() *Configuration{
        viper.AddConfigPath("E2Manager/resources/")
        viper.AddConfigPath("./resources/")  //For production
        viper.AddConfigPath("../resources/") //For test under Docker
+       viper.AddConfigPath("../../resources/") //For test under Docker
        err := viper.ReadInConfig()
        if err != nil {
-               panic(fmt.Sprintf("#http_server.parseConfiguration - failed to read configuration file: %s\n", err))
+               panic(fmt.Sprintf("#configuration.ParseConfiguration - failed to read configuration file: %s\n", err))
        }
 
        config := Configuration{}
@@ -55,27 +59,29 @@ func ParseConfiguration() *Configuration{
 
        config.NotificationResponseBuffer = viper.GetInt("notificationResponseBuffer")
        config.BigRedButtonTimeoutSec = viper.GetInt("bigRedButtonTimeoutSec")
-
+       config.MaxConnectionAttempts = viper.GetInt("maxConnectionAttempts")
+       config.MaxRnibConnectionAttempts = viper.GetInt("maxRnibConnectionAttempts")
+       config.RnibRetryIntervalMs = viper.GetInt("rnibRetryIntervalMs")
        return &config
 }
 
 func (c *Configuration)fillLoggingConfig(logConfig *viper.Viper) {
        if logConfig == nil {
-               panic(fmt.Sprintf("#http_server.fillLoggingConfig - failed to fill logging configuration: The entry 'logging' not found\n"))
+               panic(fmt.Sprintf("#configuration.fillLoggingConfig - failed to fill logging configuration: The entry 'logging' not found\n"))
        }
        c.Logging.LogLevel = logConfig.GetString("logLevel")
 }
 
 func (c *Configuration)fillHttpConfig(httpConfig *viper.Viper) {
        if httpConfig == nil {
-               panic(fmt.Sprintf("#http_server.fillHttpConfig - failed to fill HTTP configuration: The entry 'http' not found\n"))
+               panic(fmt.Sprintf("#configuration.fillHttpConfig - failed to fill HTTP configuration: The entry 'http' not found\n"))
        }
        c.Http.Port = httpConfig.GetInt("port")
 }
 
 func (c *Configuration)fillRmrConfig(rmrConfig *viper.Viper) {
        if rmrConfig == nil {
-               panic(fmt.Sprintf("#http_server.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n"))
+               panic(fmt.Sprintf("#configuration.fillRmrConfig - failed to fill RMR configuration: The entry 'rmr' not found\n"))
        }
        c.Rmr.Port = rmrConfig.GetInt("port")
        c.Rmr.MaxMsgSize = rmrConfig.GetInt("maxMsgSize")