fix #2649 set multiple hosts

This commit is contained in:
Shinsuke Sugaya 2022-05-03 22:06:43 +09:00
parent a66ea592b1
commit 0e346abecf
2 changed files with 8 additions and 2 deletions

View file

@ -15,6 +15,8 @@
*/
package org.codelibs.fess.es.client;
import static org.codelibs.core.stream.StreamUtil.split;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.fesen.client.HttpClient;
import org.codelibs.fess.Constants;
@ -29,7 +31,9 @@ public class CrawlerEngineClient extends FesenClient {
@Override
protected Client createClient() {
final FessConfig fessConfig = ComponentUtil.getFessConfig();
final Builder builder = Settings.builder().putList("http.hosts", address).put("processors", fessConfig.getCrawlerHttpProcessors());
final String[] hosts =
split(address, ",").get(stream -> stream.map(s -> s.trim()).filter(StringUtil::isNotEmpty).toArray(n -> new String[n]));
final Builder builder = Settings.builder().putList("http.hosts", hosts).put("processors", fessConfig.getCrawlerHttpProcessors());
final String username = fessConfig.getElasticsearchUsername();
final String password = fessConfig.getElasticsearchPassword();
if (StringUtil.isNotBlank(username) && StringUtil.isNotBlank(password)) {

View file

@ -348,7 +348,9 @@ public class SearchEngineClient implements Client {
}
protected Client createHttpClient(final FessConfig fessConfig, final String host) {
final Builder builder = Settings.builder().putList("http.hosts", host).put("processors", fessConfig.availableProcessors());
final String[] hosts =
split(host, ",").get(stream -> stream.map(s -> s.trim()).filter(StringUtil::isNotEmpty).toArray(n -> new String[n]));
final Builder builder = Settings.builder().putList("http.hosts", hosts).put("processors", fessConfig.availableProcessors());
final String username = fessConfig.getElasticsearchUsername();
final String password = fessConfig.getElasticsearchPassword();
if (StringUtil.isNotBlank(username) && StringUtil.isNotBlank(password)) {