X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fconfig.go;h=ac60ac5c08b1bdc3bb5b1ebb25f46febc723c677;hb=refs%2Fchanges%2F65%2F5865%2F4;hp=bb76a07234a53b69d1155b18a5fd9f6b04e95a5b;hpb=e525989b4fe86190faa820cc0a6e2f48ddb65e70;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/config.go b/pkg/xapp/config.go
index bb76a07..ac60ac5 100755
--- a/pkg/xapp/config.go
+++ b/pkg/xapp/config.go
@@ -63,9 +63,9 @@ func LoadConfig() (l *Log) {
 	}
 	l.Info("Using config file: %s", viper.ConfigFileUsed())
 
-	updatemtypes := func() {
+	updateMTypes := func() {
 		var mtypes []mtype
-		viper.UnmarshalKey("rmr.mtypes", &mtypes)
+		viper.UnmarshalKey("messaging.mtypes", &mtypes)
 
 		if len(mtypes) > 0 {
 			l.Info("Config mtypes before RICMessageTypes:%d RicMessageTypeToName:%d", len(RICMessageTypes), len(RicMessageTypeToName))
@@ -92,14 +92,19 @@ func LoadConfig() (l *Log) {
 		}
 	}
 
-	updatemtypes()
+	updateMTypes()
 
 	viper.WatchConfig()
 	viper.OnConfigChange(func(e fsnotify.Event) {
 		l.Info("config file %s changed ", e.Name)
 
-		updatemtypes()
-		Logger.SetLevel(viper.GetInt("controls.logger.level"))
+		updateMTypes()
+		if viper.IsSet("controls.logger.level") {
+			Logger.SetLevel(viper.GetInt("controls.logger.level"))
+		} else {
+			Logger.SetLevel(viper.GetInt("logger.level"))
+		}
+
 		if len(ConfigChangeListeners) > 0 {
 			for _, f := range ConfigChangeListeners {
 				go f(e.Name)
@@ -134,6 +139,16 @@ func GetPortData(pname string) (d PortData) {
 		return plist
 	}
 
+	if viper.IsSet("messaging") == false {
+		if pname == "http" {
+			d.Port = 8080
+		}
+		if pname == "rmrdata" {
+			d.Port = 4560
+		}
+		return
+	}
+
 	for _, v := range viper.GetStringMap("messaging")["ports"].([]interface{}) {
 		if n, ok := v.(map[string]interface{})["name"].(string); ok && n == pname {
 			d.Name = n
@@ -194,3 +209,7 @@ func (*Configurator) GetStringSlice(key string) []string {
 func (*Configurator) GetStringMap(key string) map[string]interface{} {
 	return viper.GetStringMap(key)
 }
+
+func (*Configurator) IsSet(key string) bool {
+	return viper.IsSet(key)
+}