diff --git a/src/main/java/org/codelibs/fess/helper/CurlHelper.java b/src/main/java/org/codelibs/fess/helper/CurlHelper.java index 8f336317d..3b65d9f8b 100644 --- a/src/main/java/org/codelibs/fess/helper/CurlHelper.java +++ b/src/main/java/org/codelibs/fess/helper/CurlHelper.java @@ -75,7 +75,7 @@ public class CurlHelper { final String[] hosts = split(ResourceUtil.getFesenHttpUrl(), ",") .get(stream -> stream.map(s -> s.trim()).filter(StringUtil::isNotEmpty).toArray(n -> new String[n])); - nodeManager = new NodeManager(hosts, node -> get(node.getUrl("/"))); + nodeManager = new NodeManager(hosts, node -> request(new CurlRequest(Method.GET, node.getUrl("/")))); nodeManager.setHeartbeatInterval(fessConfig.getElasticsearchHeartbeatIntervalAsInteger().longValue()); } @@ -96,7 +96,10 @@ public class CurlHelper { } public CurlRequest request(final Method method, final String path) { - final CurlRequest request = new FesenRequest(new CurlRequest(method, null), nodeManager, path); + return request(new FesenRequest(new CurlRequest(method, null), nodeManager, path)); + } + + protected CurlRequest request(final CurlRequest request) { final FessConfig fessConfig = ComponentUtil.getFessConfig(); final String username = fessConfig.getElasticsearchUsername(); final String password = fessConfig.getElasticsearchPassword(); diff --git a/src/main/java/org/codelibs/fess/util/ResourceUtil.java b/src/main/java/org/codelibs/fess/util/ResourceUtil.java index 3764d0a6c..78e9bda46 100644 --- a/src/main/java/org/codelibs/fess/util/ResourceUtil.java +++ b/src/main/java/org/codelibs/fess/util/ResourceUtil.java @@ -43,7 +43,7 @@ public class ResourceUtil { } public static String getFesenHttpUrl() { - final String url = System.getProperty("fess.es.http_address"); + final String url = System.getProperty(Constants.FESS_ES_HTTP_ADDRESS); if (url != null) { return url; }