summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2017-10-02 17:08:26 +0200
committerGitHub <noreply@github.com>2017-10-02 17:08:26 +0200
commit72e28a72370c6ab4756bb03c69090cc540db26a0 (patch)
tree8ede67ffbf3ce37577fbb609b03ab1c0ee0d752e
parent0d036e88a56425e816b7cbc0b8b3c80094915e51 (diff)
parent2a81ca6d5f5ad64ca85cf9b055f1f845d4afe45b (diff)
Merge pull request #3537 from vespa-engine/revert-3218-bjorncs/logging-on-reconfig
Revert "Log on reconfig"
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
index e59f012856a..fa2ee8e89a9 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java
@@ -42,7 +42,6 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -80,7 +79,7 @@ public final class ConfiguredApplication implements Application {
new ComponentRegistry<>(),
new ComponentRegistry<>());
private final OsgiFramework restrictedOsgiFramework;
- private final AtomicInteger applicationSerialNo = new AtomicInteger(0);
+ private volatile int applicationSerialNo = 0;
private HandlersConfigurerDi configurer;
private ScheduledThreadPoolExecutor shutdownDeadlineExecutor;
private Thread reconfigurerThread;
@@ -173,12 +172,10 @@ public final class ConfiguredApplication implements Application {
startAndStopServers();
log.info("Switching to the latest deployed set of configurations and components. " +
- "Application switch number: " + applicationSerialNo.getAndIncrement());
+ "Application switch number: " + (applicationSerialNo++));
}
private ContainerBuilder createBuilderWithGuiceBindings() {
- log.info("Initializing new set of configurations and components. " +
- "Application switch number: " + applicationSerialNo.get());
ContainerBuilder builder = activator.newContainerBuilder();
setupGuiceBindings(builder.guiceModules());
return builder;