diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-27 11:27:32 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-27 13:25:31 +0100 |
commit | ec3ff99398b12444ef6d84064dd50ffe4189396a (patch) | |
tree | 0a40acb909c81a5bef1273d090b01a0edc8483a7 /config-model/src/main | |
parent | 7238fddc34d63c18fd27807a5a601b7814c8b4e6 (diff) |
Misc fixes
Keep previous default port for legacy protocol. Rename parameter
'rpcPort' => 'rpcport'. Remove 'logtp' from port suffices.
Diffstat (limited to 'config-model/src/main')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java | 2 | ||||
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/admin/Logserver.java | 2 |
2 files changed, 2 insertions, 2 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 f4d719294cc..22811ae5878 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 @@ -151,7 +151,7 @@ public class Admin extends AbstractConfigProducer implements Serializable { logserver(new LogdConfig.Logserver.Builder(). use(logServerContainerCluster.isPresent() || !isHostedVespa). host(logserver.getHostName()). - rpcPort(logserver.getRelativePort(0)). + rpcport(logserver.getRelativePort(0)). port(logserver.getRelativePort(1))); } } 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 3ed1d4779b7..6c173043092 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 @@ -71,7 +71,7 @@ public class Logserver extends AbstractService { @Override public String[] getPortSuffixes() { - return new String[]{ "logtp/rpc", "logtp/legacy", "unused/1", "unused/2" }; + return new String[]{ "rpc", "legacy", "unused/1", "unused/2" }; } } |