diff options
3 files changed, 4 insertions, 13 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 e299689d1c7..79f65264249 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 @@ -189,7 +189,6 @@ public class Admin extends AbstractConfigProducer<Admin> implements Serializable else { builder. logserver(new LogdConfig.Logserver.Builder(). - userpc(true). use(logServerContainerCluster.isPresent() || !isHostedVespa). host(logserver.getHostName()). rpcport(logserver.getRelativePort(0))); diff --git a/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java b/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java index 5d62abcc4df..04ae4c76f27 100644 --- a/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/producer/AbstractConfigProducerTest.java @@ -25,7 +25,7 @@ public class AbstractConfigProducerTest { producer.getConfig(builder); LogdConfig config = new LogdConfig(builder); assertEquals("bar", config.logserver().host()); - assertEquals(1338, config.logserver().port()); + assertEquals(1338, config.logserver().rpcport()); } @Test @@ -38,7 +38,7 @@ public class AbstractConfigProducerTest { producer.getConfig(builder); LogdConfig config = new LogdConfig(builder); assertEquals("foo", config.logserver().host()); - assertEquals(1337, config.logserver().port()); + assertEquals(1337, config.logserver().rpcport()); } private static class MockLogdProducer extends AbstractConfigProducer implements LogdConfig.Producer { @@ -49,7 +49,7 @@ public class AbstractConfigProducerTest { @Override public void getConfig(LogdConfig.Builder builder) { - builder.logserver(new LogdConfig.Logserver.Builder().host("bar").port(1338)); + builder.logserver(new LogdConfig.Logserver.Builder().host("bar").rpcport(1338)); } } @@ -67,7 +67,7 @@ public class AbstractConfigProducerTest { @Override public void getConfig(LogdConfig.Builder builder) { - builder.logserver(new LogdConfig.Logserver.Builder().host("foo").port(1337)); + builder.logserver(new LogdConfig.Logserver.Builder().host("foo").rpcport(1337)); } } } diff --git a/logd/src/main/resources/configdefinitions/logd.def b/logd/src/main/resources/configdefinitions/logd.def index 58cf1913a2b..3bed6e267b2 100644 --- a/logd/src/main/resources/configdefinitions/logd.def +++ b/logd/src/main/resources/configdefinitions/logd.def @@ -10,14 +10,6 @@ logserver.host string default="localhost" ## RPC port of logserver. logserver.rpcport int default=5822 -## Legacy port to contact the logserver on. -## Deprecated (not used). TODO: Remove on Vespa 8. -logserver.port int default=5821 - -## Use RPC protocol -## Deprecated (always true). TODO: Remove on Vespa 8. -logserver.userpc bool default=true - ## Forward to a logserver. Other logserver configuration is irrelevant if false. logserver.use bool default=true |