diff options
author | Harald Musum <musum@yahooinc.com> | 2023-03-16 09:55:52 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-03-16 09:55:52 +0100 |
commit | 4abbc863c85f4e49596b834d775e55db153f4e0c (patch) | |
tree | 07ff6f1a68937934827b9756d87f64af5fce406e /config-model/src/main | |
parent | 14a20682b61451ca2cda23c4d60600bbffef9c8b (diff) |
Minor changes after feedback in review
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java | 4 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index 85454c509fe..f7bc04b6da1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -94,7 +94,7 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri this.multitenant = multitenant; this.fileDistribution = new FileDistributionConfigProducer(parent); this.applicationType = applicationType; - this.logctlSpecs.addAll(setDefaultLogctlSpecs()); + this.logctlSpecs.addAll(defaultLogctlSpecs()); } public Configserver getConfigserver() { return defaultConfigserver; } @@ -332,7 +332,7 @@ public class Admin extends TreeConfigProducer<AnyConfigProducer> implements Seri logctlSpecs.add(new LogctlSpec(componentSpec, levelsModSpec)); } - private static Set<LogctlSpec> setDefaultLogctlSpecs() { + private static Set<LogctlSpec> defaultLogctlSpecs() { // Turn off info logging for all containers for some classes (unimportant log messages that create noise in vespa log) return Set.of(new LogctlSpec("com.yahoo.vespa.spifly.repackaged.spifly.BaseActivator", getLevelModSpec("-info")), new LogctlSpec("org.eclipse.jetty.server.Server", getLevelModSpec("-info")), diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java index 7bcc920fbee..d101cea428e 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ApplicationContainerCluster.java @@ -126,10 +126,10 @@ public final class ApplicationContainerCluster extends ContainerCluster<Applicat @Override protected void doPrepare(DeployState deployState) { + super.doPrepare(deployState); addAndSendApplicationBundles(deployState); sendUserConfiguredFiles(deployState); createEndpointList(deployState); - super.doPrepare(deployState); } private void addAndSendApplicationBundles(DeployState deployState) { |