Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Mark Payne 2016-06-29 16:36:55 -04:00 committed by Matt Burgess
parent b7a584122d
commit 8f1202899b
3 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/LogRepository.java
View File

@ -76,4 +76,12 @@ public interface LogRepository {
* @return the current logger for the component
*/
ComponentLog getLogger();
boolean isDebugEnabled();
boolean isInfoEnabled();
boolean isWarnEnabled();
boolean isErrorEnabled();
}

25
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/logging/repository/StandardLogRepository.java
View File

@ -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);
}
}

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/processor/SimpleProcessLogger.java
View File

@ -167,29 +167,29 @@ public class SimpleProcessLogger implements ComponentLog {
logRepository.addLogMessage(LogLevel.TRACE, msg, os, t);
}
@Override
public boolean isWarnEnabled() {
return logger.isWarnEnabled();
}
@Override
public boolean isTraceEnabled() {
return logger.isTraceEnabled();
}
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled() || logRepository.isDebugEnabled();
}
@Override
public boolean isInfoEnabled() {
return logger.isInfoEnabled();
return logger.isInfoEnabled() || logRepository.isInfoEnabled();
}
@Override
public boolean isWarnEnabled() {
return logger.isWarnEnabled() || logRepository.isWarnEnabled();
}
@Override
public boolean isErrorEnabled() {
return logger.isErrorEnabled();
}
@Override
public boolean isDebugEnabled() {
return logger.isDebugEnabled();
return logger.isErrorEnabled() || logRepository.isErrorEnabled();
}
@Override