X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRefreshConfigTask.java;h=4080b37cfd8b2c38c24f157b42db95403d6704c3;hb=b66dcce5210e25b2571036becb6f0e7b0c23e1b2;hp=267fc1f10e9e2cd897ca977bb5904c2de0526027;hpb=eeaabb5364f23818dda5d10e0a7f30396bb981f4;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java index 267fc1f1..4080b37c 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RefreshConfigTask.java @@ -81,9 +81,9 @@ public class RefreshConfigTask { stop(); loadConfigurationFromFile(); refreshTask = createRefreshTask() // - .subscribe(notUsed -> logger.info("Refreshed configuration data"), + .subscribe(notUsed -> logger.debug("Refreshed configuration data"), throwable -> logger.error("Configuration refresh terminated due to exception", throwable), - () -> logger.error("Configuration refresh terminated")); + () -> logger.debug("Configuration refresh completed")); } public void stop() { @@ -116,8 +116,9 @@ public class RefreshConfigTask { return cbsClient.updates(getConfigRequest, initialDelay, refreshPeriod); } - private Mono onErrorResume(Throwable trowable) { - logger.error("Could not refresh application configuration {}", trowable.toString()); + private Mono onErrorResume(Throwable throwable) { + String errMsg = throwable.toString(); + logger.error("Could not refresh application configuration. {}", errMsg); return Mono.empty(); } @@ -136,7 +137,7 @@ public class RefreshConfigTask { /** * Reads the configuration from file. */ - public void loadConfigurationFromFile() { + void loadConfigurationFromFile() { String filepath = appConfig.getLocalConfigurationFilePath(); if (filepath == null) { logger.debug("No localconfiguration file used"); @@ -147,9 +148,6 @@ public class RefreshConfigTask { try (InputStream inputStream = createInputStream(filepath)) { JsonObject rootObject = getJsonElement(inputStream).getAsJsonObject(); - if (rootObject == null) { - throw new JsonSyntaxException("Root is not a json object"); - } ApplicationConfigParser appParser = new ApplicationConfigParser(); appParser.parse(rootObject); appConfig.setConfiguration(appParser.getRicConfigs(), appParser.getDmaapPublisherConfig(),