From fbbf4e2f449baecec371ab94d1aaa63d06293a5a Mon Sep 17 00:00:00 2001
From: Mark Payne <markap14@hotmail.com>
Date: Wed, 29 Jun 2016 16:36:55 -0400
Subject: [PATCH] NIFI-2158 : return 'true' for isXYZEnabled() for ComponentLog
 if either the slf4j logger has that level enabled or the bulletin repository
 does, instead of only checking if slf4j logger has it enabled

---
 .../apache/nifi/logging/LogRepository.java    |  8 ++++++
 .../repository/StandardLogRepository.java     | 25 +++++++++++++++++++
 .../nifi/processor/SimpleProcessLogger.java   | 18 ++++++-------
 3 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
index 54bb6720d450..06ddab4ea133 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
@@ -76,4 +76,12 @@ public interface LogRepository {
      * @return the current logger for the component
      */
     ComponentLog getLogger();
+
+    boolean isDebugEnabled();
+
+    boolean isInfoEnabled();
+
+    boolean isWarnEnabled();
+
+    boolean isErrorEnabled();
 }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
index f6c55b6d9932..8baf04aca0c2 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
@@ -183,4 +183,29 @@ public void setLogger(final ComponentLog componentLogger) {
     public ComponentLog getLogger() {
         return componentLogger;
     }
+
+    private boolean hasObserver(final LogLevel logLevel) {
+        final Collection<LogObserver> logLevelObservers = observers.get(logLevel);
+        return (logLevelObservers != null && !logLevelObservers.isEmpty());
+    }
+
+    @Override
+    public boolean isDebugEnabled() {
+        return hasObserver(LogLevel.DEBUG);
+    }
+
+    @Override
+    public boolean isInfoEnabled() {
+        return hasObserver(LogLevel.INFO);
+    }
+
+    @Override
+    public boolean isWarnEnabled() {
+        return hasObserver(LogLevel.WARN);
+    }
+
+    @Override
+    public boolean isErrorEnabled() {
+        return hasObserver(LogLevel.ERROR);
+    }
 }
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 4f317228107e..cc17abc31b74 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
@@ -168,28 +168,28 @@ public void trace(String msg, Object[] os, Throwable t) {
     }
 
     @Override
-    public boolean isWarnEnabled() {
-        return logger.isWarnEnabled();
+    public boolean isTraceEnabled() {
+        return logger.isTraceEnabled();
     }
 
     @Override
-    public boolean isTraceEnabled() {
-        return logger.isTraceEnabled();
+    public boolean isDebugEnabled() {
+        return logger.isDebugEnabled() || logRepository.isDebugEnabled();
     }
 
     @Override
     public boolean isInfoEnabled() {
-        return logger.isInfoEnabled();
+        return logger.isInfoEnabled() || logRepository.isInfoEnabled();
     }
 
     @Override
-    public boolean isErrorEnabled() {
-        return logger.isErrorEnabled();
+    public boolean isWarnEnabled() {
+        return logger.isWarnEnabled() || logRepository.isWarnEnabled();
     }
 
     @Override
-    public boolean isDebugEnabled() {
-        return logger.isDebugEnabled();
+    public boolean isErrorEnabled() {
+        return logger.isErrorEnabled() || logRepository.isErrorEnabled();
     }
 
     @Override