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

NIFI-79 - Introduces the ability to set Bulletin Level to NONE

This commit is contained in:
Andre F de Miranda 2017-03-25 09:47:42 +11:00 committed by Matt Gilman
parent 457df93dd6
commit a7bf683a0d
No known key found for this signature in database
GPG Key ID: DF61EC19432AEE37
4 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-api/src/main/java/org/apache/nifi/logging/LogLevel.java
View File

@ -23,5 +23,6 @@ public enum LogLevel {
INFO, INFO,
WARN, WARN,
ERROR, ERROR,
FATAL; FATAL,
NONE;
} }

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

@ -16,6 +16,15 @@
*/ */
package org.apache.nifi.logging.repository; package org.apache.nifi.logging.repository;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.LogLevel;
import org.apache.nifi.logging.LogMessage;
import org.apache.nifi.logging.LogObserver;
import org.apache.nifi.logging.LogRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.MessageFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@ -23,16 +32,6 @@ import java.util.Map;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.nifi.logging.ComponentLog;
import org.apache.nifi.logging.LogLevel;
import org.apache.nifi.logging.LogMessage;
import org.apache.nifi.logging.LogObserver;
import org.apache.nifi.logging.LogRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.MessageFormatter;
public class StandardLogRepository implements LogRepository { public class StandardLogRepository implements LogRepository {
public static final int DEFAULT_MAX_CAPACITY_PER_LEVEL = 10; public static final int DEFAULT_MAX_CAPACITY_PER_LEVEL = 10;
@ -118,8 +117,8 @@ public class StandardLogRepository implements LogRepository {
} }
} }
// at this point, the observer should have been found // at this point, the LogLevel must be NONE since we don't register observers for NONE
throw new IllegalStateException("The specified observer identifier does not exist."); return LogLevel.NONE;
} finally { } finally {
readLock.unlock(); readLock.unlock();
} }
@ -136,12 +135,15 @@ public class StandardLogRepository implements LogRepository {
final LogLevel[] allLevels = LogLevel.values(); final LogLevel[] allLevels = LogLevel.values();
for (int i = minimumLevel.ordinal(); i < allLevels.length; i++) { for (int i = minimumLevel.ordinal(); i < allLevels.length; i++) {
Collection<LogObserver> collection = observers.get(allLevels[i]); // no need to register an observer for NONE since that level will never be logged to by a component
if (collection == null) { if (i != LogLevel.NONE.ordinal()) {
collection = new ArrayList<>(); Collection<LogObserver> collection = observers.get(allLevels[i]);
observers.put(allLevels[i], collection); if (collection == null) {
collection = new ArrayList<>();
observers.put(allLevels[i], collection);
}
collection.add(observer);
} }
collection.add(observer);
} }
observerLookup.put(observerIdentifier, observer); observerLookup.put(observerIdentifier, observer);
} finally { } finally {

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd
View File

@ -345,6 +345,7 @@
<xs:enumeration value="WARN"></xs:enumeration> <xs:enumeration value="WARN"></xs:enumeration>
<xs:enumeration value="ERROR"></xs:enumeration> <xs:enumeration value="ERROR"></xs:enumeration>
<xs:enumeration value="FATAL"></xs:enumeration> <xs:enumeration value="FATAL"></xs:enumeration>
<xs:enumeration value="NONE"></xs:enumeration>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>

3
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js
View File

@ -590,6 +590,9 @@
}, { }, {
text: 'ERROR', text: 'ERROR',
value: 'ERROR' value: 'ERROR'
}, {
text: 'NONE',
value: 'NONE'
}] }]
}); });