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

fix #2087 update admin upgrade page

Browse source
This commit is contained in:
Shinsuke Sugaya 2019-04-13 14:04:03 +09:00
parent 125720e240
commit 9ca7671812
3 changed files with 82 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugin.xml
View file

@ -22,12 +22,12 @@
</antcall>
<!-- analysis-fess -->
<antcall target="install.plugin">
<param name="repo.url" value="${maven.release.repo.url}" />
<param name="repo.url" value="${maven.snapshot.repo.url}" />
<param name="plugin.groupId" value="org/codelibs" />
<param name="plugin.name.prefix" value="elasticsearch-" />
<param name="plugin.name" value="analysis-fess" />
<param name="plugin.version" value="7.0.0" />
<param name="plugin.zip.version" value="7.0.0" />
<param name="plugin.version" value="7.0.1-SNAPSHOT" />
<param name="plugin.zip.version" value="7.0.1-20190412.223833-2" />
</antcall>
<!-- configsync -->
<antcall target="install.plugin">

77
src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
View file

@ -51,6 +51,12 @@ public class AdminUpgradeAction extends FessAdminAction {
private static final String VERSION_12_3 = "12.3";
private static final String VERSION_12_4 = "12.4";
private static final String VERSION_12_5 = "12.5";
private static final String VERSION_12_6 = "12.6";
// ===================================================================================
// Attribute
//
@ -115,6 +121,9 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_1();
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -129,6 +138,9 @@ public class AdminUpgradeAction extends FessAdminAction {
upgradeFrom12_1();
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -142,6 +154,9 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
upgradeFrom12_2();
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -154,6 +169,9 @@ public class AdminUpgradeAction extends FessAdminAction {
} else if (VERSION_12_3.equals(form.targetVersion)) {
try {
upgradeFrom12_3();
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
@ -161,7 +179,46 @@ public class AdminUpgradeAction extends FessAdminAction {
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_2, e.getLocalizedMessage()));
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_3, e.getLocalizedMessage()));
}
} else if (VERSION_12_4.equals(form.targetVersion)) {
try {
upgradeFrom12_4();
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_4, e.getLocalizedMessage()));
}
} else if (VERSION_12_5.equals(form.targetVersion)) {
try {
upgradeFrom12_5();
upgradeFrom12_6();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_5, e.getLocalizedMessage()));
}
} else if (VERSION_12_6.equals(form.targetVersion)) {
try {
upgradeFrom12_6();
upgradeFromAll();
saveInfo(messages -> messages.addSuccessStartedDataUpdate(GLOBAL));
systemHelper.reloadConfiguration();
} catch (final Exception e) {
logger.warn("Failed to upgrade data.", e);
saveError(messages -> messages.addErrorsFailedToUpgradeFrom(GLOBAL, VERSION_12_6, e.getLocalizedMessage()));
}
} else {
saveError(messages -> messages.addErrorsUnknownVersionForUpgrade(GLOBAL));
@ -191,6 +248,24 @@ public class AdminUpgradeAction extends FessAdminAction {
ComponentUtil.getThumbnailManager().migrate();
}
private void upgradeFrom12_4() {
// nothing
}
private void upgradeFrom12_5() {
// nothing
}
private void upgradeFrom12_6() {
final IndicesAdminClient indicesClient = fessEsClient.admin().indices();
UpgradeUtil.deleteIndex(indicesClient, ".fess_config.web_config_to_role", res -> {});
UpgradeUtil.deleteIndex(indicesClient, ".fess_config.file_config_to_role", res -> {});
UpgradeUtil.deleteIndex(indicesClient, ".fess_config.data_config_to_role", res -> {});
UpgradeUtil.addFieldMapping(indicesClient, "fess_log.search_log", "search_log", "hitCountRelation",
"{\"properties\":{\"hitCountRelation\":{\"type\":\"keyword\"}}}");
}
private void upgradeFromAll() {
// nothing
}

3
src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
View file

@ -48,6 +48,9 @@
<la:option value="12.1">12.1</la:option>
<la:option value="12.2">12.2</la:option>
<la:option value="12.3">12.3</la:option>
<la:option value="12.4">12.4</la:option>
<la:option value="12.5">12.5</la:option>
<la:option value="12.6">12.6</la:option>
</la:select>
</div>
</div>