You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by an...@apache.org on 2016/10/19 20:50:31 UTC
karaf-decanter git commit: [KARAF-4791] - Decanter:
elasticsearch-rest appender should support multipe addresses
Repository: karaf-decanter
Updated Branches:
refs/heads/master 50b326e33 -> ddf8f6b23
[KARAF-4791] - Decanter: elasticsearch-rest appender should support
multipe addresses
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/ddf8f6b2
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/ddf8f6b2
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/ddf8f6b2
Branch: refs/heads/master
Commit: ddf8f6b23dce037fd09f80f81ad5114113ae0f61
Parents: 50b326e
Author: anierbeck <bc...@googlemail.com>
Authored: Wed Oct 19 22:26:14 2016 +0200
Committer: anierbeck <bc...@googlemail.com>
Committed: Wed Oct 19 22:26:14 2016 +0200
----------------------------------------------------------------------
.../elasticsearch/rest/ElasticsearchAppender.java | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/ddf8f6b2/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java b/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
index 2cdce23..e829f65 100644
--- a/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
+++ b/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
@@ -17,8 +17,11 @@
package org.apache.karaf.decanter.appender.elasticsearch.rest;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Set;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
@@ -65,13 +68,19 @@ public class ElasticsearchAppender implements EventHandler {
}
public void open(Dictionary<String, Object> config) {
- String address = getValue(config, "address", "http://localhost:9200");
+ String addressesString = getValue(config, "address", "http://localhost:9200");
+ Set<String> addresses = new HashSet<String>(Arrays.asList(addressesString.split(";")));
String username = getValue(config, "username", null);
String password = getValue(config, "password", null);
- Builder builder = new HttpClientConfig.Builder(address)
- .discoveryEnabled(true)
- .discoveryFrequency(1l, TimeUnit.MINUTES)
+ Builder builder = new HttpClientConfig.Builder(addresses)
.multiThreaded(true);
+
+ if (addresses.size() > 1) {
+ builder = builder
+ .discoveryEnabled(true)
+ .discoveryFrequency(1l, TimeUnit.MINUTES);
+ }
+
if (username != null) {
builder = builder.defaultCredentials(username, password);
}