From 710914675f4b5cae727092c4779e82b17dd2b145 Mon Sep 17 00:00:00 2001
From: Brian Ghigiarelli <brianghig@gmail.com>
Date: Tue, 26 May 2015 11:03:40 -0400
Subject: [PATCH] Processor Loggers will now use the same Logger Level for
 throwables as they do for the log messages. Previously, enabling DEBUG was
 the only way to see stacktraces from throwables in INFO, WARN, or ERROR
 levels

---
 .../apache/nifi/util/MockProcessorLog.java    | 24 +++++--------------
 .../nifi/processor/SimpleProcessLogger.java   | 24 +++++--------------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
index 837784b0425c..f09961ffd175 100644
--- a/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
+++ b/nifi/nifi-mock/src/main/java/org/apache/nifi/util/MockProcessorLog.java
@@ -88,9 +88,7 @@ public void warn(String msg, Object[] os, final Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.warn(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.warn("", t);
-        }
+        logger.warn("", t);
     }
 
     @Override
@@ -160,9 +158,7 @@ public void info(String msg, Throwable t) {
         final Object[] os = {component};
 
         logger.info(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.info("", t);
-        }
+        logger.info("", t);
     }
 
     @Override
@@ -187,9 +183,7 @@ public void info(String msg, Object[] os, Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.info(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.info("", t);
-        }
+        logger.info("", t);
     }
 
     @Override
@@ -203,9 +197,7 @@ public void error(String msg, Throwable t) {
         final Object[] os = {component};
 
         logger.error(msg, os, t);
-        if (logger.isDebugEnabled()) {
-            logger.error("", t);
-        }
+        logger.error("", t);
     }
 
     @Override
@@ -233,9 +225,7 @@ public void error(String msg, Object[] os, Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.error(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.error("", t);
-        }
+        logger.error("", t);
     }
 
     @Override
@@ -260,9 +250,7 @@ public void debug(String msg, Object[] os, Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.debug(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.debug("", t);
-        }
+        logger.debug("", t);
     }
 
     @Override
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
index afd0c592cf6b..fc6d1f747646 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
@@ -84,9 +84,7 @@ public void warn(String msg, Object[] os, final Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.warn(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.warn("", t);
-        }
+        logger.warn("", t);
         logRepository.addLogMessage(LogLevel.WARN, msg, os, t);
     }
 
@@ -163,9 +161,7 @@ public void info(String msg, Throwable t) {
         final Object[] os = {component};
 
         logger.info(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.info("", t);
-        }
+        logger.info("", t);
         logRepository.addLogMessage(LogLevel.INFO, msg, os, t);
     }
 
@@ -193,9 +189,7 @@ public void info(String msg, Object[] os, Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.info(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.info("", t);
-        }
+        logger.info("", t);
         logRepository.addLogMessage(LogLevel.INFO, msg, os, t);
     }
 
@@ -210,9 +204,7 @@ public void error(String msg, Throwable t) {
         final Object[] os = {component};
 
         logger.error(msg, os, t);
-        if (logger.isDebugEnabled()) {
-            logger.error("", t);
-        }
+        logger.error("", t);
         logRepository.addLogMessage(LogLevel.ERROR, msg, os, t);
     }
 
@@ -254,9 +246,7 @@ public void error(String msg, Object[] os, Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.error(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.error("", t);
-        }
+        logger.error("", t);
         logRepository.addLogMessage(LogLevel.ERROR, msg, os, t);
     }
 
@@ -284,9 +274,7 @@ public void debug(String msg, Object[] os, Throwable t) {
         msg = "{} " + msg + ": {}";
 
         logger.debug(msg, os);
-        if (logger.isDebugEnabled()) {
-            logger.debug("", t);
-        }
+        logger.debug("", t);
         logRepository.addLogMessage(LogLevel.DEBUG, msg, os, t);
     }