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

diff --git a/pkg/xapp/xapp.go b/pkg/xapp/xapp.go
index 1f02285..f778265 100755
--- a/pkg/xapp/xapp.go
+++ b/pkg/xapp/xapp.go
@@ -47,6 +47,7 @@ var (
 	Config        Configurator
 	Subscription  *Subscriber
 	Alarm         *AlarmClient
+	Util          *Utils
 	readyCb       ReadyCB
 	readyCbParams interface{}
 	shutdownCb    ShutdownCB
@@ -90,13 +91,13 @@ func registerXapp() {
 	for {
 		time.Sleep(5 * time.Second)
 		if !IsHealthProbeReady() {
-			Logger.Info("xApp is not ready yet, waiting ...")
+			Logger.Info("Application='%s' is not ready yet, waiting ...", viper.GetString("name"))
 			continue
 		}
 
-		Logger.Info("xApp is now up and ready, continue with registration ...")
+		Logger.Debug("Application='%s' is now up and ready, continue with registration ...", viper.GetString("name"))
 		if err := doRegister(); err == nil {
-			Logger.Info("xApp registration done, proceeding with startup ...")
+			Logger.Info("Registration done, proceeding with startup ...")
 			break
 		}
 	}
@@ -242,14 +243,18 @@ func init() {
 	} else {
 		Logger.SetLevel(viper.GetInt("logger.level"))
 	}
-	Logger.SetFormat(0)
+
+	if !viper.IsSet("controls.logger.noFormat") || !viper.GetBool("controls.logger.noFormat") {
+		Logger.SetFormat(0)
+	}
 
 	Resource = NewRouter()
 	Config = Configurator{}
 	Metric = NewMetrics(viper.GetString("metrics.url"), viper.GetString("metrics.namespace"), Resource.router)
-	Subscription = NewSubscriber(viper.GetString("subscription.host"), viper.GetInt("subscription.timeout"))
+	Subscription = NewSubscriber(viper.GetString("controls.subscription.host"), viper.GetInt("controls.subscription.timeout"))
 	Sdl = NewSDLClient(viper.GetString("controls.db.namespace"))
 	Rnib = NewRNIBClient()
+	Util = NewUtils()
 
 	InstallSignalHandler()
 }