honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Setting `path.work` does not affect the logs location, closes #366.

This commit is contained in:
kimchy 2010-09-11 22:22:49 +03:00
parent bc42352f7e
commit ed5ffd6591
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/elasticsearch/src/main/java/org/elasticsearch/node/internal/InternalSettingsPerparer.java
View File

@ -45,13 +45,6 @@ public class InternalSettingsPerparer {
Environment environment = new Environment(settingsBuilder.build()); Environment environment = new Environment(settingsBuilder.build());
// put back the env settings
settingsBuilder = settingsBuilder().put(pSettings);
settingsBuilder.put("path.home", cleanPath(environment.homeFile().getAbsolutePath()));
settingsBuilder.put("path.work", cleanPath(environment.workFile().getAbsolutePath()));
settingsBuilder.put("path.work_with_cluster", cleanPath(environment.workWithClusterFile().getAbsolutePath()));
settingsBuilder.put("path.logs", cleanPath(environment.logsFile().getAbsolutePath()));
if (loadConfigSettings) { if (loadConfigSettings) {
try { try {
settingsBuilder.loadFromUrl(environment.resolveConfig("elasticsearch.yml")); settingsBuilder.loadFromUrl(environment.resolveConfig("elasticsearch.yml"));
@ -99,6 +92,18 @@ public class InternalSettingsPerparer {
settingsBuilder.put(ClusterName.SETTING, ClusterName.DEFAULT.value()); settingsBuilder.put(ClusterName.SETTING, ClusterName.DEFAULT.value());
} }
return new Tuple<Settings, Environment>(settingsBuilder.build(), environment); Settings v1 = settingsBuilder.build();
environment = new Environment(v1);
// put back the env settings
settingsBuilder = settingsBuilder().put(v1);
settingsBuilder.put("path.home", cleanPath(environment.homeFile().getAbsolutePath()));
settingsBuilder.put("path.work", cleanPath(environment.workFile().getAbsolutePath()));
settingsBuilder.put("path.work_with_cluster", cleanPath(environment.workWithClusterFile().getAbsolutePath()));
settingsBuilder.put("path.logs", cleanPath(environment.logsFile().getAbsolutePath()));
v1 = settingsBuilder.build();
return new Tuple<Settings, Environment>(v1, environment);
} }
} }