fix #1244 add fess.es.cluster_name

codelibs · Aug 24, 2017 · 9465378 · 9465378
1 parent 4b4f681
commit 9465378
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/org/codelibs/fess/job/CrawlJob.java b/src/main/java/org/codelibs/fess/job/CrawlJob.java
@@ -262,10 +262,13 @@ protected void executeCrawler() {
             if (StringUtil.isNotBlank(transportAddresses)) {
                 cmdList.add("-D" + Constants.FESS_ES_TRANSPORT_ADDRESSES + "=" + transportAddresses);
             }
-            final String clusterName = System.getProperty(Constants.FESS_ES_CLUSTER_NAME);
-            if (StringUtil.isNotBlank(clusterName)) {
-                cmdList.add("-D" + Constants.FESS_ES_CLUSTER_NAME + "=" + clusterName);
-            }
+        }
+
+        final String clusterName = System.getProperty(Constants.FESS_ES_CLUSTER_NAME);
+        if (StringUtil.isNotBlank(clusterName)) {
+            cmdList.add("-D" + Constants.FESS_ES_CLUSTER_NAME + "=" + clusterName);
+        } else {
+            cmdList.add("-D" + Constants.FESS_ES_CLUSTER_NAME + "=" + fessConfig.getElasticsearchClusterName());
         }
 
         final String systemLastaEnv = System.getProperty("lasta.env");

diff --git a/src/main/java/org/codelibs/fess/job/SuggestJob.java b/src/main/java/org/codelibs/fess/job/SuggestJob.java
@@ -160,10 +160,13 @@ protected void executeSuggestCreator() {
             if (StringUtil.isNotBlank(transportAddresses)) {
                 cmdList.add("-D" + Constants.FESS_ES_TRANSPORT_ADDRESSES + "=" + transportAddresses);
             }
-            final String clusterName = System.getProperty(Constants.FESS_ES_CLUSTER_NAME);
-            if (StringUtil.isNotBlank(clusterName)) {
-                cmdList.add("-D" + Constants.FESS_ES_CLUSTER_NAME + "=" + clusterName);
-            }
+        }
+
+        final String clusterName = System.getProperty(Constants.FESS_ES_CLUSTER_NAME);
+        if (StringUtil.isNotBlank(clusterName)) {
+            cmdList.add("-D" + Constants.FESS_ES_CLUSTER_NAME + "=" + clusterName);
+        } else {
+            cmdList.add("-D" + Constants.FESS_ES_CLUSTER_NAME + "=" + fessConfig.getElasticsearchClusterName());
         }
 
         final String lastaEnv = System.getProperty("lasta.env");