diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-10-14 18:01:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-14 18:01:16 +0200 |
commit | 868c29b272eb7773d5c4515cb33640a44074d05a (patch) | |
tree | 1fdcbfbb9840a92e8068e20296a94c12a5da389f /container-core/src/main/java/com/yahoo/container/di/Container.java | |
parent | ffcc28f2b9180ad8774c67fddbebc81b41f2fc6c (diff) |
Revert "Container config improvements [run-systemtest]"
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/di/Container.java')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/di/Container.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java index e437f440c41..bec685c71ef 100644 --- a/container-core/src/main/java/com/yahoo/container/di/Container.java +++ b/container-core/src/main/java/com/yahoo/container/di/Container.java @@ -48,7 +48,7 @@ public class Container { private final ComponentDeconstructor componentDeconstructor; private final Osgi osgi; - private final ConfigRetriever retriever; + private final ConfigRetriever configurer; private List<String> platformBundles; // Used to verify that platform bundles don't change. private long previousConfigGeneration = -1L; private long leastGeneration = -1L; @@ -62,7 +62,7 @@ public class Container { platformBundlesConfigKey = new ConfigKey<>(PlatformBundlesConfig.class, configId); componentsConfigKey = new ConfigKey<>(ComponentsConfig.class, configId); var bootstrapKeys = Set.of(applicationBundlesConfigKey, platformBundlesConfigKey, componentsConfigKey); - this.retriever = new ConfigRetriever(bootstrapKeys, subscriberFactory); + this.configurer = new ConfigRetriever(bootstrapKeys, subscriberFactory::getSubscriber); } public Container(SubscriberFactory subscriberFactory, String configId, ComponentDeconstructor componentDeconstructor) { @@ -91,10 +91,10 @@ public class Container { { ConfigSnapshot snapshot; while (true) { - snapshot = retriever.getConfigs(graph.configKeys(), leastGeneration, isInitializing); + snapshot = configurer.getConfigs(graph.configKeys(), leastGeneration, isInitializing); if (log.isLoggable(FINE)) - log.log(FINE, String.format("getConfigAndCreateGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n", + log.log(FINE, String.format("createNewGraph:\n" + "graph.configKeys = %s\n" + "graph.generation = %s\n" + "snapshot = %s\n", graph.configKeys(), graph.generation(), snapshot)); if (snapshot instanceof BootstrapConfigs) { @@ -127,11 +127,11 @@ public class Container { } private long getBootstrapGeneration() { - return retriever.getBootstrapGeneration(); + return configurer.getBootstrapGeneration(); } private long getComponentsGeneration() { - return retriever.getComponentsGeneration(); + return configurer.getComponentsGeneration(); } private String configGenerationsString() { @@ -215,7 +215,7 @@ public class Container { } private void invalidateGeneration(long generation, Throwable cause) { - leastGeneration = Math.max(retriever.getComponentsGeneration(), retriever.getBootstrapGeneration()) + 1; + leastGeneration = Math.max(configurer.getComponentsGeneration(), configurer.getBootstrapGeneration()) + 1; if (!(cause instanceof InterruptedException) && !(cause instanceof ConfigInterruptedException)) { log.log(Level.WARNING, newGraphErrorMessage(generation, cause), cause); } @@ -250,7 +250,7 @@ public class Container { } void shutdownConfigurer() { - retriever.shutdown(); + configurer.shutdown(); } // Reload config manually, when subscribing to non-configserver sources |