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

#2841 Fix fess_basic_config alias handling for Fess multi-instance support.

Browse source
This commit is contained in:
Shinsuke Sugaya 2024-08-24 11:22:00 +09:00
parent 327d2eb160
commit e7657528ef
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/codelibs/fess/app/web/admin/backup/AdminBackupAction.java
View file

@ -346,7 +346,7 @@ public class AdminBackupAction extends FessAdminAction {
}
});
} else {
final String index;
String index;
final String filename;
if (id.endsWith(".bulk")) {
index = id.substring(0, id.length() - 5);
@ -355,9 +355,17 @@ public class AdminBackupAction extends FessAdminAction {
index = id;
filename = id + ".bulk";
}
if ("fess_config".equals(index)) {
index = fessConfig.getIndexConfigIndex();
} else if ("fess_user".equals(index)) {
index = fessConfig.getIndexUserIndex();
} else if ("fess_basic_config".equals(index) && !"fess_config".equals(fessConfig.getIndexConfigIndex())) {
index = "basic_" + fessConfig.getIndexConfigIndex();
}
final String alias = index;
return asStream(filename).contentTypeOctetStream().stream(out -> {
try (final BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out.stream(), Constants.CHARSET_UTF_8))) {
SearchEngineUtil.scroll(index, hit -> {
SearchEngineUtil.scroll(alias, hit -> {
try {
writer.write("{\"index\":{\"_index\":\"" + hit.getIndex() + "\",\"_id\":\""
+ StringEscapeUtils.escapeJson(hit.getId()) + "\"}}\n");

6
src/main/java/org/codelibs/fess/es/client/SearchEngineClient.java
View file

@ -647,7 +647,11 @@ public class SearchEngineClient implements Client {
}
} else if (index.startsWith(CONFIG_INDEX_PREFIX)) {
final String name = fessConfig.getIndexConfigIndex();
aliasName = aliasName.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name);
if ("fess_basic_config".equals(aliasName) && !CONFIG_INDEX_PREFIX.equals(name)) {
aliasName = aliasName.replaceFirst("fess_basic_config", "basic_" + name);
} else {
aliasName = aliasName.replaceFirst(Pattern.quote(CONFIG_INDEX_PREFIX), name);
}
} else if (index.startsWith(USER_INDEX_PREFIX)) {
final String name = fessConfig.getIndexUserIndex();
aliasName = aliasName.replaceFirst(Pattern.quote(USER_INDEX_PREFIX), name);