You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2016/07/07 17:37:09 UTC
nifi git commit: 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
Repository: nifi
Updated Branches:
refs/heads/master b7a584122 -> 8f1202899
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
This closes #598
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8f120289
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8f120289
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8f120289
Branch: refs/heads/master
Commit: 8f1202899b2be8ebae58746a9be564225a3514ce
Parents: b7a5841
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jun 29 16:36:55 2016 -0400
Committer: Matt Burgess <ma...@apache.org>
Committed: Thu Jul 7 13:33:34 2016 -0400
----------------------------------------------------------------------
.../org/apache/nifi/logging/LogRepository.java | 8 +++++++
.../repository/StandardLogRepository.java | 25 ++++++++++++++++++++
.../nifi/processor/SimpleProcessLogger.java | 18 +++++++-------
3 files changed, 42 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8f120289/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
----------------------------------------------------------------------
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 54bb672..06ddab4 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();
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/8f120289/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
----------------------------------------------------------------------
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 f6c55b6..8baf04a 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 class StandardLogRepository implements LogRepository {
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);
+ }
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/8f120289/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 4f31722..cc17abc 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 class SimpleProcessLogger implements ComponentLog {
}
@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