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

fix problem with outputting proper error when failing to parse configuration on startup

This commit is contained in:
kimchy 2010-03-20 00:28:15 +02:00
parent a344ebb1b3
commit d4dc3cacc1
2 changed files with 86 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -51,26 +51,8 @@ public class Bootstrap {
private Server server;
private void setup(boolean addShutdownHook) throws Exception {
Tuple<Settings, Environment> tuple = InternalSettingsPerparer.prepareSettings(EMPTY_SETTINGS, true);
try {
Classes.getDefaultClassLoader().loadClass("org.apache.log4j.Logger");
LogConfigurator.configure(tuple.v1());
} catch (ClassNotFoundException e) {
// no log4j
} catch (NoClassDefFoundError e) {
// no log4j
} catch (Exception e) {
System.err.println("Failed to configure logging...");
e.printStackTrace();
}
if (tuple.v1().get(JmxService.SettingsConstants.CREATE_CONNECTOR) == null) {
// automatically create the connector if we are bootstrapping
Settings updated = settingsBuilder().put(tuple.v1()).put(JmxService.SettingsConstants.CREATE_CONNECTOR, true).build();
tuple = new Tuple<Settings, Environment>(updated, tuple.v2());
}
private void setup(boolean addShutdownHook, Tuple<Settings, Environment> tuple) throws Exception {
tuple = setupJmx(tuple);
ServerBuilder serverBuilder = ServerBuilder.serverBuilder().settings(tuple.v1()).loadConfigSettings(false);
server = serverBuilder.build();
@ -83,11 +65,40 @@ public class Bootstrap {
}
}
private static Tuple<Settings, Environment> setupJmx(Tuple<Settings, Environment> tuple) {
if (tuple.v1().get(JmxService.SettingsConstants.CREATE_CONNECTOR) == null) {
// automatically create the connector if we are bootstrapping
Settings updated = settingsBuilder().put(tuple.v1()).put(JmxService.SettingsConstants.CREATE_CONNECTOR, true).build();
tuple = new Tuple<Settings, Environment>(updated, tuple.v2());
}
return tuple;
}
private static void setupLogging(Tuple<Settings, Environment> tuple) {
try {
Classes.getDefaultClassLoader().loadClass("org.apache.log4j.Logger");
LogConfigurator.configure(tuple.v1());
} catch (ClassNotFoundException e) {
// no log4j
} catch (NoClassDefFoundError e) {
// no log4j
} catch (Exception e) {
System.err.println("Failed to configure logging...");
e.printStackTrace();
}
}
private static Tuple<Settings, Environment> initialSettings() {
return InternalSettingsPerparer.prepareSettings(EMPTY_SETTINGS, true);
}
/**
* hook for JSVC
*/
public void init(String[] args) throws Exception {
setup(true);
Tuple<Settings, Environment> tuple = initialSettings();
setupLogging(tuple);
setup(true, tuple);
}
/**
@ -119,13 +130,24 @@ public class Bootstrap {
boolean foreground = System.getProperty("es-foreground") != null;
Tuple<Settings, Environment> tuple = null;
try {
tuple = initialSettings();
setupLogging(tuple);
} catch (Exception e) {
String errorMessage = buildErrorMessage("Setup", e);
System.err.println(errorMessage);
System.err.flush();
System.exit(3);
}
String stage = "Initialization";
try {
if (!foreground) {
Loggers.disableConsoleLogging();
System.out.close();
}
bootstrap.setup(true);
bootstrap.setup(true, tuple);
if (pidFile != null) {
new File(pidFile).deleteOnExit();
@ -142,6 +164,22 @@ public class Bootstrap {
if (bootstrap.server != null) {
logger = Loggers.getLogger(Bootstrap.class, bootstrap.server.settings().get("name"));
}
String errorMessage = buildErrorMessage(stage, e);
if (foreground) {
logger.error(errorMessage);
} else {
System.err.println(errorMessage);
System.err.flush();
}
Loggers.disableConsoleLogging();
if (logger.isDebugEnabled()) {
logger.debug("Exception", e);
}
System.exit(3);
}
}
private static String buildErrorMessage(String stage, Throwable e) {
StringBuilder errorMessage = new StringBuilder("{").append(Version.full()).append("}: ");
try {
if (ANSI.isEnabled()) {
@ -175,17 +213,6 @@ public class Bootstrap {
} else {
errorMessage.append("- ").append(ExceptionsHelper.detailedMessage(e, true, 0));
}
if (foreground) {
logger.error(errorMessage.toString());
} else {
System.err.println(errorMessage);
System.err.flush();
}
Loggers.disableConsoleLogging();
if (logger.isDebugEnabled()) {
logger.debug("Exception", e);
}
System.exit(3);
}
return errorMessage.toString();
}
}

6
modules/elasticsearch/src/main/java/org/elasticsearch/util/settings/ImmutableSettings.java
View File

@ -465,7 +465,7 @@ public class ImmutableSettings implements Settings {
try {
Map<String, String> loadedSettings = settingsLoader.load(source);
put(loadedSettings);
} catch (IOException e) {
} catch (Exception e) {
throw new SettingsException("Failed to load settings from [" + source + "]");
}
return this;
@ -492,8 +492,8 @@ public class ImmutableSettings implements Settings {
try {
Map<String, String> loadedSettings = settingsLoader.load(Streams.copyToString(new InputStreamReader(is, "UTF-8")));
put(loadedSettings);
} catch (IOException e) {
throw new SettingsException("Failed to load settings from [" + resourceName + "]");
} catch (Exception e) {
throw new SettingsException("Failed to load settings from [" + resourceName + "]", e);
}
return this;
}