0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#2649 fix node check path

Browse source
This commit is contained in:
Shinsuke Sugaya 2022-05-06 11:58:08 +09:00
parent 4052edd20a
commit 26433e174e
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/org/codelibs/fess/helper/CurlHelper.java
View file

@ -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();

2
src/main/java/org/codelibs/fess/util/ResourceUtil.java
View file

@ -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;
}