honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-26 06:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename StartupError to StartupException

Browse Source 
This commit renames StartupError to StartupException. This rename is due
to the fact that this class inherits from Exception not Error in the
Throwable class hierarchy.
This commit is contained in:
Jason Tedor 2016-08-19 14:51:54 -04:00
parent cf32f8de34
commit 3a6f7eb07a
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -273,7 +273,7 @@ final class Bootstrap {
// guice: log the shortened exc to the log file
ByteArrayOutputStream os = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(os, false, "UTF-8");
new StartupError(e).printStackTrace(ps);
new StartupException(e).printStackTrace(ps);
ps.flush();
logger.error("Guice Exception: {}", os.toString("UTF-8"));
} else {

3
core/src/main/java/org/elasticsearch/bootstrap/Elasticsearch.java
View File

@ -23,7 +23,6 @@ import joptsimple.OptionSet;
import joptsimple.OptionSpec;
import joptsimple.OptionSpecBuilder;
import joptsimple.util.PathConverter;
import joptsimple.util.PathProperties;
import org.elasticsearch.Build;
import org.elasticsearch.cli.ExitCodes;
import org.elasticsearch.cli.SettingCommand;
@ -102,7 +101,7 @@ class Elasticsearch extends SettingCommand {
} catch (final Throwable t) {
// format exceptions to the console in a special way
// to avoid 2MB stacktraces from guice, etc.
throw new StartupError(t);
throw new StartupException(t);
}
}

22
core/src/main/java/org/elasticsearch/bootstrap/StartupError.java → core/src/main/java/org/elasticsearch/bootstrap/StartupException.java
View File

@ -32,18 +32,18 @@ import java.io.PrintStream;
*/
//TODO: remove this when guice is removed, and exceptions are cleaned up
//this is horrible, but its what we must do
final class StartupError extends RuntimeException {
final class StartupException extends RuntimeException {
/** maximum length of a stacktrace, before we truncate it */
static final int STACKTRACE_LIMIT = 30;
/** all lines from this package are RLE-compressed */
static final String GUICE_PACKAGE = "org.elasticsearch.common.inject";
/**
* Create a new StartupError that will format {@code cause}
/**
* Create a new StartupException that will format {@code cause}
* to the console on failure.
*/
StartupError(Throwable cause) {
StartupException(Throwable cause) {
super(cause);
}
@ -58,10 +58,10 @@ final class StartupError extends RuntimeException {
if (cause instanceof CreationException) {
cause = getFirstGuiceCause((CreationException)cause);
}
String message = cause.toString();
s.println(message);
if (cause != null) {
// walk to the root cause
while (cause.getCause() != null) {
@ -82,7 +82,7 @@ final class StartupError extends RuntimeException {
break;
}
String line = stack[i].toString();
// skip past contiguous runs of this garbage:
if (line.startsWith(GUICE_PACKAGE)) {
while (i + 1 < stack.length && stack[i + 1].toString().startsWith(GUICE_PACKAGE)) {
@ -103,8 +103,8 @@ final class StartupError extends RuntimeException {
s.println("Refer to the log for complete error details.");
}
}
/**
/**
* Returns first cause from a guice error (it can have multiple).
*/
static Throwable getFirstGuiceCause(CreationException guice) {