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 2015/07/27 19:29:22 UTC
karaf-decanter git commit: [KARAF-3889] - The clusterName for the
elasticsearch appender isn't an optional configuration as it should be.
Repository: karaf-decanter
Updated Branches:
refs/heads/master 19e712f9b -> 71b248bcb
[KARAF-3889] - The clusterName for the elasticsearch appender isn't an
optional configuration as it should be.
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/71b248bc
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/71b248bc
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/71b248bc
Branch: refs/heads/master
Commit: 71b248bcb4bb551fcc5c1c691e6daf9d6b511c84
Parents: 19e712f
Author: anierbeck <bc...@googlemail.com>
Authored: Mon Jul 27 19:29:07 2015 +0200
Committer: anierbeck <bc...@googlemail.com>
Committed: Mon Jul 27 19:29:07 2015 +0200
----------------------------------------------------------------------
.../apache/karaf/decanter/appender/elasticsearch/Activator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/71b248bc/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/Activator.java
----------------------------------------------------------------------
diff --git a/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/Activator.java b/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/Activator.java
index 7165ccb..07c8aa1 100644
--- a/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/Activator.java
+++ b/appender/elasticsearch/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/Activator.java
@@ -68,7 +68,7 @@ public class Activator implements BundleActivator {
String host = config != null ? (String)config.get("host") : "localhost";
int port = config != null ? Integer.parseInt((String)config.get("port")) : 9300;
- String clusterName = config != null ? (String)config.get("clusterName") : "elasticsearch";
+ String clusterName = (config != null && config.get("clusterName") != null) ? (String)config.get("clusterName") : "elasticsearch";
appender = new ElasticsearchAppender(host, port, clusterName);
appender.open();
Dictionary<String, String> properties = new Hashtable<>();