honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-27 07:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add back path.logs setup in internal settings preparer

Browse Source
This commit is contained in:
Ryan Ernst 2015-09-08 15:28:25 -07:00
parent e4e71d8a9a
commit ea4c27a089
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java
View File

@ -112,7 +112,7 @@ public class LogConfigurator {
}
}
// ensure explicit path to logs dir exists
props.put("path.logs", cleanPath(environment.logsFile().toAbsolutePath().toString()));
props.setProperty("log4j.path.logs", cleanPath(environment.logsFile().toAbsolutePath().toString()));
PropertyConfigurator.configure(props);
}

6
core/src/main/java/org/elasticsearch/node/internal/InternalSettingsPreparer.java
View File

@ -42,6 +42,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ThreadLocalRandom;
import static org.elasticsearch.common.Strings.cleanPath;
import static org.elasticsearch.common.settings.Settings.settingsBuilder;
/**
@ -125,6 +126,11 @@ public class InternalSettingsPreparer {
initializeSettings(output, input, false);
finalizeSettings(output, terminal, environment.configFile());
environment = new Environment(output.build());
// we put back the path.logs so we can use it in the logging configuration file
output.put("path.logs", cleanPath(environment.logsFile().toAbsolutePath().toString()));
return new Environment(output.build());
}