From: Amichai Date: Wed, 1 Apr 2020 08:12:59 +0000 (+0300) Subject: [RICPLT-213] Print configurations to log on startup X-Git-Tag: R5_RC~112 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=dbf8e0032295fac936779b0f117d0600b94c85fc;p=ric-plt%2Fe2mgr.git [RICPLT-213] Print configurations to log on startup Change-Id: Ib86747db31d9caa1715b5ae4bb8809248955907e Signed-off-by: Amichai --- diff --git a/E2Manager/app/main.go b/E2Manager/app/main.go index 719e8d7..f597e9c 100644 --- a/E2Manager/app/main.go +++ b/E2Manager/app/main.go @@ -49,6 +49,7 @@ func main() { fmt.Printf("#app.main - failed to initialize logger, error: %s", err) os.Exit(1) } + logger.Infof("#app.main - Configuration %s", config) db := sdlgo.NewDatabase() sdl := sdlgo.NewSdlInstance("e2Manager", db) defer sdl.Close() diff --git a/E2Manager/configuration/configuration.go b/E2Manager/configuration/configuration.go index 267c25a..9ef7c33 100644 --- a/E2Manager/configuration/configuration.go +++ b/E2Manager/configuration/configuration.go @@ -117,3 +117,26 @@ func (c *Configuration) populateGlobalRicIdConfig(globalRicIdConfig *viper.Viper c.GlobalRicId.PlmnId = globalRicIdConfig.GetString("plmnId") c.GlobalRicId.RicNearRtId = globalRicIdConfig.GetString("ricNearRtId") } + +func (c *Configuration) String() string { + return fmt.Sprintf("{logging.logLevel: %s, http.port: %d, rmr: { port: %d, maxMsgSize: %d}, routingManager.baseUrl: %s, "+ + "notificationResponseBuffer: %d, bigRedButtonTimeoutSec: %d, maxConnectionAttempts: %d, maxRnibConnectionAttempts: %d, "+ + "rnibRetryIntervalMs: %d, keepAliveResponseTimeoutMs: %d, keepAliveDelayMs: %d, e2tInstanceDeletionTimeoutMs: %d, "+ + "globalRicId: { plmnId: %s, ricNearRtId: %s}}", + c.Logging.LogLevel, + c.Http.Port, + c.Rmr.Port, + c.Rmr.MaxMsgSize, + c.RoutingManager.BaseUrl, + c.NotificationResponseBuffer, + c.BigRedButtonTimeoutSec, + c.MaxConnectionAttempts, + c.MaxRnibConnectionAttempts, + c.RnibRetryIntervalMs, + c.KeepAliveResponseTimeoutMs, + c.KeepAliveDelayMs, + c.E2TInstanceDeletionTimeoutMs, + c.GlobalRicId.PlmnId, + c.GlobalRicId.RicNearRtId, + ) +} diff --git a/E2Manager/configuration/configuration_test.go b/E2Manager/configuration/configuration_test.go index ac76d99..38f8bba 100644 --- a/E2Manager/configuration/configuration_test.go +++ b/E2Manager/configuration/configuration_test.go @@ -44,6 +44,11 @@ func TestParseConfigurationSuccess(t *testing.T) { assert.NotEmpty(t, config.GlobalRicId.RicNearRtId) } +func TestStringer(t *testing.T) { + config := ParseConfiguration().String() + assert.NotEmpty(t, config) +} + func TestParseConfigurationFileNotFoundFailure(t *testing.T) { configPath := "../resources/configuration.yaml" configPathTmp := "../resources/configuration.yaml_tmp"