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

fix #506

Browse source
This commit is contained in:
Shinsuke Sugaya 2016-05-17 23:10:02 +09:00
parent 2f6358f5d5
commit 35d7189630
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,6 +26,8 @@ import javax.annotation.Resource;
import org.codelibs.core.exception.ResourceNotFoundRuntimeException;
import org.codelibs.core.io.FileUtil;
import org.codelibs.core.io.ResourceUtil;
import org.codelibs.elasticsearch.runner.net.Curl;
import org.codelibs.elasticsearch.runner.net.CurlResponse;
import org.codelibs.fess.app.web.base.FessAdminAction;
import org.codelibs.fess.es.client.FessEsClient;
import org.codelibs.fess.es.config.exbhv.DataConfigBhv;
@ -38,7 +40,6 @@ import org.codelibs.fess.es.config.exbhv.RoleTypeBhv;
import org.codelibs.fess.es.config.exbhv.WebConfigBhv;
import org.codelibs.fess.es.config.exbhv.WebConfigToRoleBhv;
import org.codelibs.fess.mylasta.direction.FessConfig;
import org.codelibs.fess.util.StreamUtil;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
@ -141,7 +142,7 @@ public class AdminUpgradeAction extends FessAdminAction {
try {
// file
// TODO seunjeon
uploadResource(indexConfigPath, docIndex, "ko/seunjeon.txt");
// alias
createAlias(indicesClient, indexConfigPath, configIndex, ".fess_basic_config");
@ -337,6 +338,24 @@ public class AdminUpgradeAction extends FessAdminAction {
}
}
private void uploadResource(String indexConfigPath, String indexName, String path) {
final String filePath = indexConfigPath + "/" + indexName + "/" + path;
try {
String source = FileUtil.readUTF8(filePath);
try (CurlResponse response =
Curl.post(org.codelibs.fess.util.ResourceUtil.getElasticsearchHttpUrl() + "/_configsync/file").param("path", path)
.body(source).execute()) {
if (response.getHttpStatusCode() == 200) {
logger.info("Register " + path + " to " + indexName);
} else {
logger.warn("Invalid request for " + path);
}
}
} catch (final Exception e) {
logger.warn("Failed to register " + filePath, e);
}
}
private void createAlias(final IndicesAdminClient indicesClient, final String indexConfigPath, final String indexName,
final String aliasName) {
final String aliasConfigPath = indexConfigPath + "/" + indexName + "/alias/" + aliasName + ".json";