Merge pull request #13660 from pickypg/feature/fix-bootstrap-logger-prefix-13658

Moving system property setting to before it can be used
This commit is contained in:
Chris Earle 2015-09-22 10:41:26 -04:00
commit 4438e8fe7d
1 changed files with 3 additions and 1 deletions

View File

@ -218,6 +218,9 @@ final class Bootstrap {
* to startup elasticsearch.
*/
static void init(String[] args) throws Throwable {
// Set the system property before anything has a chance to trigger its use
System.setProperty("es.logger.prefix", "");
BootstrapCLIParser bootstrapCLIParser = new BootstrapCLIParser();
CliTool.ExitStatus status = bootstrapCLIParser.execute(args);
@ -225,7 +228,6 @@ final class Bootstrap {
System.exit(status.status());
}
System.setProperty("es.logger.prefix", "");
INSTANCE = new Bootstrap();
boolean foreground = !"false".equals(System.getProperty("es.foreground", System.getProperty("es-foreground")));