github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-29 09:54:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

remove hack

Browse source
This commit is contained in:
Robert Muir 2014-11-03 14:46:30 -05:00
parent a19d85a968
commit 446bc09b4e
1 changed files with 0 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/org/elasticsearch/common/logging/support/AbstractESLogger.java
View file

@ -19,10 +19,6 @@
package org.elasticsearch.common.logging.support; package org.elasticsearch.common.logging.support;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.ESLogger;
/** /**
@ -52,7 +48,6 @@ public abstract class AbstractESLogger implements ESLogger {
@Override @Override
public void trace(String msg, Throwable cause, Object... params) { public void trace(String msg, Throwable cause, Object... params) {
checkThrowable(cause); // nocommit
if (isTraceEnabled()) { if (isTraceEnabled()) {
internalTrace(LoggerMessageFormat.format(prefix, msg, params), cause); internalTrace(LoggerMessageFormat.format(prefix, msg, params), cause);
} }
@ -72,7 +67,6 @@ public abstract class AbstractESLogger implements ESLogger {
@Override @Override
public void debug(String msg, Throwable cause, Object... params) { public void debug(String msg, Throwable cause, Object... params) {
checkThrowable(cause); // nocommit
if (isDebugEnabled()) { if (isDebugEnabled()) {
internalDebug(LoggerMessageFormat.format(prefix, msg, params), cause); internalDebug(LoggerMessageFormat.format(prefix, msg, params), cause);
} }
@ -92,7 +86,6 @@ public abstract class AbstractESLogger implements ESLogger {
@Override @Override
public void info(String msg, Throwable cause, Object... params) { public void info(String msg, Throwable cause, Object... params) {
checkThrowable(cause); // nocommit
if (isInfoEnabled()) { if (isInfoEnabled()) {
internalInfo(LoggerMessageFormat.format(prefix, msg, params), cause); internalInfo(LoggerMessageFormat.format(prefix, msg, params), cause);
} }
@ -112,7 +105,6 @@ public abstract class AbstractESLogger implements ESLogger {
@Override @Override
public void warn(String msg, Throwable cause, Object... params) { public void warn(String msg, Throwable cause, Object... params) {
checkThrowable(cause); // nocommit
if (isWarnEnabled()) { if (isWarnEnabled()) {
internalWarn(LoggerMessageFormat.format(prefix, msg, params), cause); internalWarn(LoggerMessageFormat.format(prefix, msg, params), cause);
} }
@ -132,27 +124,10 @@ public abstract class AbstractESLogger implements ESLogger {
@Override @Override
public void error(String msg, Throwable cause, Object... params) { public void error(String msg, Throwable cause, Object... params) {
checkThrowable(cause); // nocommit
if (isErrorEnabled()) { if (isErrorEnabled()) {
internalError(LoggerMessageFormat.format(prefix, msg, params), cause); internalError(LoggerMessageFormat.format(prefix, msg, params), cause);
} }
} }
protected abstract void internalError(String msg, Throwable cause); protected abstract void internalError(String msg, Throwable cause);
// nocommit: remove this
static void checkThrowable(Throwable t) {
try {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
PrintWriter writer = new PrintWriter(new OutputStreamWriter(bos, "UTF-8"));
t.printStackTrace(writer);
writer.close();
String toString = bos.toString("UTF-8");
if (toString.contains("CIRCULAR REFERENCE:")) {
throw new Error("seriously screwed up");
}
} catch (Exception e) {
throw new Error("even worse");
}
}
} }