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

fix #2701 check if bulk file contains scheduled_job

Browse source
This commit is contained in:
Shinsuke Sugaya 2022-12-22 13:19:50 +09:00
parent 4a1d83c612
commit df18b81094
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import java.util.stream.Collectors;
@ -185,6 +186,7 @@ public class AdminBackupAction extends FessAdminAction {
private void importBulk(final String fileName, final File tempFile) {
final ObjectMapper mapper = new ObjectMapper();
final AtomicBoolean resetJobs = new AtomicBoolean(false);
try (CurlResponse response = ComponentUtil.getCurlHelper().post("/_bulk").onConnect((req, con) -> {
con.setDoOutput(true);
try (final BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(tempFile)));
@ -205,8 +207,13 @@ public class AdminBackupAction extends FessAdminAction {
indexObj.remove("_type");
}
final String index = indexObj.get("_index");
if (index != null && index.startsWith(".fess")) {
indexObj.put("_index", index.substring(1));
if (index != null) {
if (index.startsWith(".fess")) {
indexObj.put("_index", index.substring(1));
}
if (index.endsWith("scheduled_job")) {
resetJobs.set(true);
}
}
bw.write(mapper.writeValueAsString(dataObj));
} else {
@ -226,7 +233,7 @@ public class AdminBackupAction extends FessAdminAction {
if (logger.isDebugEnabled()) {
logger.debug("Bulk Response:\n{}", response.getContentAsString());
}
systemHelper.reloadConfiguration();
systemHelper.reloadConfiguration(resetJobs.get());
} catch (final Exception e) {
logger.warn("Failed to process bulk file: {}", fileName, e);
} finally {

8
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -474,6 +474,10 @@ public class SystemHelper {
}
public void reloadConfiguration() {
reloadConfiguration(true);
}
public void reloadConfiguration(final boolean resetJobs) {
ComponentUtil.getSearchEngineClient().refresh();
ComponentUtil.getSuggestHelper().init();
@ -486,7 +490,9 @@ public class SystemHelper {
ComponentUtil.getKeyMatchHelper().update();
ComponentUtil.getLdapManager().updateConfig();
ComponentUtil.getJobManager().reboot();
if (resetJobs) {
ComponentUtil.getJobManager().reboot();
}
updateSystemProperties();
}