diff options
author | Lester Solbakken <lesters@yahoo-inc.com> | 2017-09-28 15:54:25 +0200 |
---|---|---|
committer | Lester Solbakken <lesters@yahoo-inc.com> | 2017-09-28 15:54:25 +0200 |
commit | 92a3b3413b59cfec8911af9e9eb762c7a571b541 (patch) | |
tree | 2116af102ccf077011f379009590bfcc725be22e /vespa-hadoop | |
parent | 85e3ec191db3d843bfe0d8d58d3c0bbd7b082514 (diff) |
Don't hardcode endpoint port
Diffstat (limited to 'vespa-hadoop')
-rw-r--r-- | vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java | 2 | ||||
-rw-r--r-- | vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java index 6a99a7bc08b..a227c4c10fb 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/VespaRecordWriter.java @@ -153,7 +153,7 @@ public class VespaRecordWriter extends RecordWriter { while (tokenizer.hasMoreTokens()) { String endpoint = tokenizer.nextToken().trim(); sessionParams.addCluster(new Cluster.Builder().addEndpoint( - Endpoint.create(endpoint, 4080, false) + Endpoint.create(endpoint, configuration.defaultPort(), false) ).build()); } diff --git a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java index 59da262428f..79b7703032c 100644 --- a/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java +++ b/vespa-hadoop/src/main/java/com/yahoo/vespa/hadoop/mapreduce/util/VespaConfiguration.java @@ -11,6 +11,7 @@ import java.util.Properties; public class VespaConfiguration { public static final String ENDPOINT = "vespa.feed.endpoint"; + public static final String DEFAULT_PORT = "vespa.feed.defaultport"; public static final String PROXY_HOST = "vespa.feed.proxy.host"; public static final String PROXY_PORT = "vespa.feed.proxy.port"; public static final String DRYRUN = "vespa.feed.dryrun"; @@ -46,6 +47,11 @@ public class VespaConfiguration { } + public int defaultPort() { + return getInt(DEFAULT_PORT, 4080); + } + + public String proxyHost() { return getString(PROXY_HOST); } |