Merge pull request #2 from mguillermin/clustername

Make elasticsearch cluster name configurable
cleverage · Jun 28, 2012 · f75e584 · f75e584
2 parents 08612fc + 4a0e337
commit f75e584
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/module/app/com/github/cleverage/elasticsearch/IndexClient.java b/module/app/com/github/cleverage/elasticsearch/IndexClient.java
@@ -65,6 +65,9 @@ public void start() throws Exception {
         else
         {
             settings.put("client.transport.sniff", true);
+            if (IndexConfig.clusterName != null) {
+                settings.put("cluster.name", IndexConfig.clusterName);
+            }
             settings.build();
 
             Logger.info("ElasticSearch : Starting in Client Mode");

diff --git a/module/app/com/github/cleverage/elasticsearch/IndexConfig.java b/module/app/com/github/cleverage/elasticsearch/IndexConfig.java
@@ -16,6 +16,7 @@
  * example :
  * elasticsearch.local=false
  * elasticsearch.client="192.168.0.46:9300"
+ * elasticsearch.cluster.name=myCluster
  * elasticsearch.index.name=play2-elasticsearch
  * elasticsearch.index.clazzs="indexing.*"
  * elasticsearch.index.show_request=true
@@ -33,6 +34,11 @@ public class IndexConfig {
      */
     public static String client = null;
 
+    /**
+     * elasticsearch.cluster.name = name of the elasticsearch cluster
+     */
+    public static String clusterName = null;
+
     /**
      * Debug mode for log search request and response
      */
@@ -62,6 +68,7 @@ public IndexConfig(Application app) {
         this.application = app;
         this.client = app.configuration().getString("elasticsearch.client");
         this.local = app.configuration().getBoolean("elasticsearch.local");
+        this.clusterName = app.configuration().getString("elasticsearch.cluster.name");
 
         this.indexName = app.configuration().getString("elasticsearch.index.name");
         this.indexClazzs = app.configuration().getString("elasticsearch.index.clazzs");