Repository: nifi Updated Branches: refs/heads/master be27c07c7 -> 807eb8de6
NIFI-1447 modified SimpleProcessLogger Modified SimpleProcessLogger to ensure that whenever is called it prints full stack trace. Signed-off-by: jpercivall <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/807eb8de Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/807eb8de Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/807eb8de Branch: refs/heads/master Commit: 807eb8de6d7054cef1fac91cbf2e2a1eb37d30ed Parents: be27c07 Author: Oleg Zhurakousky <[email protected]> Authored: Fri Jan 29 11:01:15 2016 -0500 Committer: jpercivall <[email protected]> Committed: Fri Jan 29 12:39:27 2016 -0500 ---------------------------------------------------------------------- .../nifi/processor/SimpleProcessLogger.java | 37 ++++++++------------ 1 file changed, 14 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/807eb8de/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java index ae61881..25928f1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java @@ -262,13 +262,14 @@ public class SimpleProcessLogger implements ProcessorLog { } msg = "{} " + msg; - Object[] os = {component, t.toString()}; + Object[] os = t == null ? new Object[]{component} : new Object[]{component, t.toString()}; logger.error(msg, os); - if (logger.isDebugEnabled()) { + if (t != null){ logger.error("", t); + logRepository.addLogMessage(LogLevel.ERROR, msg, os, t); + } else { + logRepository.addLogMessage(LogLevel.ERROR, msg, os); } - - logRepository.addLogMessage(LogLevel.ERROR, msg, os, t); } @Override @@ -289,15 +290,21 @@ public class SimpleProcessLogger implements ProcessorLog { @Override public void error(String msg) { + this.error(msg, (Throwable) null); + } + + @Override + public void error(String msg, Object[] os, Throwable t) { if (!isErrorEnabled()) { return; } - msg = "{} " + msg; - final Object[] os = {component}; + os = addProcessorAndThrowable(os, t); + msg = "{} " + msg + ": {}"; logger.error(msg, os); - logRepository.addLogMessage(LogLevel.ERROR, msg, os); + logger.error("", t); + logRepository.addLogMessage(LogLevel.ERROR, msg, os, t); } private Object[] addProcessorAndThrowable(final Object[] os, final Throwable t) { @@ -312,22 +319,6 @@ public class SimpleProcessLogger implements ProcessorLog { } @Override - public void error(String msg, Object[] os, Throwable t) { - if (!isErrorEnabled()) { - return; - } - - os = addProcessorAndThrowable(os, t); - msg = "{} " + msg + ": {}"; - - logger.error(msg, os); - if (logger.isDebugEnabled()) { - logger.error("", t); - } - logRepository.addLogMessage(LogLevel.ERROR, msg, os, t); - } - - @Override public void debug(String msg, Throwable t) { if (!isDebugEnabled()) { return;
