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=7cfe4868ee69e277b2ccd5184c003bc0f3c76146;hb=d375c04a9c1917a9bf98285fb1f30062cff7a6d6;hp=176dd6c3c4549fa80e903e1a4946c67f5a5484ec;hpb=643ba188e7c1d0c8ce097adfd94ced47b2da615e;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 176dd6c3..7cfe4868 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 @@ -109,8 +109,9 @@ public class RefreshConfigTask { logger.debug("Starting refreshConfigTask"); stop(); refreshTask = createRefreshTask() // - .subscribe(notUsed -> logger.debug("Refreshed configuration data"), - throwable -> logger.error("Configuration refresh terminated due to exception", throwable), + .subscribe( + notUsed -> logger.debug("Refreshed configuration data"), throwable -> logger + .error("Configuration refresh terminated due to exception {}", throwable.getMessage()), () -> logger.error("Configuration refresh terminated")); } @@ -126,16 +127,16 @@ public class RefreshConfigTask { .filter(notUsed -> !this.isConsulUsed) // .flatMap(notUsed -> loadConfigurationFromFile()) // .onErrorResume(this::ignoreError) // - .doOnNext(json -> logger.debug("loadFromFile")) // + .doOnNext(json -> logger.debug("loadFromFile succeeded")) // .doOnTerminate(() -> logger.error("loadFromFile Terminate")); Flux loadFromConsul = getEnvironment(systemEnvironment) // .flatMap(this::createCbsClient) // .flatMapMany(this::periodicConfigurationUpdates) // .onErrorResume(this::ignoreError) // - .doOnNext(json -> logger.debug("loadFromConsul")) // + .doOnNext(json -> logger.debug("loadFromConsul succeeded")) // .doOnNext(json -> this.isConsulUsed = true) // - .doOnTerminate(() -> logger.error("loadFromConsul Terminate")); + .doOnTerminate(() -> logger.error("loadFromConsul Terminated")); return Flux.merge(loadFromFile, loadFromConsul) // .flatMap(this::parseConfiguration) // @@ -176,8 +177,7 @@ public class RefreshConfigTask { } private Flux updateConfig(ApplicationConfigParser.ConfigParserResult config) { - return this.appConfig.setConfiguration(config.ricConfigs(), config.dmaapPublisherConfig(), - config.dmaapConsumerConfig()); + return this.appConfig.setConfiguration(config); } boolean configFileExists() {