diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-05-14 13:19:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-14 13:19:58 +0200 |
commit | d96591996962bd34b8075888386042c01a686346 (patch) | |
tree | 81b8ca68f65922db72a5d94748a401566c68b7a0 /config-model | |
parent | f11e8bf70d94847b7f5dd9ad0d2cf8789dc6d01c (diff) | |
parent | 32b9f4241f48c6e9d7916c2fee4a0c3433f7bf50 (diff) |
Merge pull request #9172 from vespa-engine/bjorncs/logserver-cleanup
Remove legacy protocol from logserver
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java | 3 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java | 6 |
2 files changed, 3 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 6c7b105b118..6183701e36e 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 @@ -162,8 +162,7 @@ public class Admin extends AbstractConfigProducer implements Serializable { userpc(true). use(logServerContainerCluster.isPresent() || !isHostedVespa). host(logserver.getHostName()). - rpcport(logserver.getRelativePort(0)). - port(logserver.getRelativePort(1))); + rpcport(logserver.getRelativePort(0))); } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java index 6c173043092..eca8fd40e69 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java @@ -19,7 +19,7 @@ public class Logserver extends AbstractService { public Logserver(AbstractConfigProducer parent) { super(parent, "logserver"); portsMeta.on(0).tag("logtp").tag("rpc"); - portsMeta.on(1).tag("logtp").tag("legacy"); + portsMeta.on(1).tag("unused"); portsMeta.on(2).tag("unused"); portsMeta.on(3).tag("unused"); setProp("clustertype", "admin"); @@ -40,8 +40,6 @@ public class Logserver extends AbstractService { StringBuilder sb = new StringBuilder(); sb.append("-Dlogserver.rpcListenPort=").append(getRelativePort(0)); sb.append(" "); - sb.append("-Dlogserver.listenport=").append(getRelativePort(1)); - sb.append(" "); sb.append("-Dlogserver.logarchive.dir=" + logArchiveDir); return sb.toString(); } @@ -71,7 +69,7 @@ public class Logserver extends AbstractService { @Override public String[] getPortSuffixes() { - return new String[]{ "rpc", "legacy", "unused/1", "unused/2" }; + return new String[]{ "rpc", "unused/1", "unused/2", "unused/3" }; } } |