diff options
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java | 21 |
1 files changed, 15 insertions, 6 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 6b0c9a1abb2..50e9e29a6d9 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 @@ -48,7 +48,10 @@ public class Admin extends AbstractConfigProducer implements Serializable { private final List<Slobrok> slobroks = new ArrayList<>(); private Configserver defaultConfigserver; + + /** The log server, or null if none */ private Logserver logserver; + private LogForwarder.Config logForwarderConfig = null; private ApplicationType applicationType = ApplicationType.DEFAULT; @@ -115,6 +118,7 @@ public class Admin extends AbstractConfigProducer implements Serializable { public void setLogserver(Logserver logserver) { this.logserver = logserver; } + /** Returns the log server for this, or null if none */ public Logserver getLogserver() { return logserver; } public void addConfigservers(List<Configserver> configservers) { @@ -147,12 +151,17 @@ public class Admin extends AbstractConfigProducer implements Serializable { } public void getConfig(LogdConfig.Builder builder) { - builder. - logserver(new LogdConfig.Logserver.Builder(). - use(logServerContainerCluster.isPresent() || !isHostedVespa). - host(logserver.getHostName()). - port(logserver.getRelativePort(1))); - } + if (logserver == null) { + builder.logserver(new LogdConfig.Logserver.Builder().use(false)); + } + else { + builder. + logserver(new LogdConfig.Logserver.Builder(). + use(logServerContainerCluster.isPresent() || !isHostedVespa). + host(logserver.getHostName()). + port(logserver.getRelativePort(1))); + } + } public void getConfig(SlobroksConfig.Builder builder) { for (Slobrok slob : slobroks) { |