Skip to content

Commit 61e4acf

Browse files
Adding ALWAYS Java Level
Adding and configuring ESAPI.ALL to map to Java.ALWAYS
1 parent d9075aa commit 61e4acf

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

src/main/java/org/owasp/esapi/logging/java/ESAPICustomJavaLevel.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ public class ESAPICustomJavaLevel extends Level {
3030
*/
3131
public static final Level ERROR_LEVEL = new ESAPICustomJavaLevel( "ERROR", Level.SEVERE.intValue() - 1);
3232

33+
/**
34+
* Defines a custom level that should result in content always being recorded, unless the Java Logging configuration is set to OFF.
35+
*/
36+
public static final Level ALWAYS_LEVEL = new ESAPICustomJavaLevel( "ERROR", Level.OFF.intValue() - 1);
37+
3338
/**
3439
* Constructs an instance of a JavaLoggerLevel which essentially provides a mapping between the name of
3540
* the defined level and its numeric value.

src/main/java/org/owasp/esapi/logging/java/JavaLogFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class JavaLogFactory implements LogFactory {
6767
JAVA_LOG_APPENDER = createLogAppender(logUserInfo, logClientInfo, logServerIp, logApplicationName, appName);
6868

6969
Map<Integer, JavaLogLevelHandler> levelLookup = new HashMap<>();
70-
levelLookup.put(Logger.ALL, JavaLogLevelHandlers.ALL);
70+
levelLookup.put(Logger.ALL, JavaLogLevelHandlers.ALWAYS);
7171
levelLookup.put(Logger.TRACE, JavaLogLevelHandlers.FINEST);
7272
levelLookup.put(Logger.DEBUG, JavaLogLevelHandlers.FINE);
7373
levelLookup.put(Logger.INFO, JavaLogLevelHandlers.INFO);

src/main/java/org/owasp/esapi/logging/java/JavaLogLevelHandlers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public enum JavaLogLevelHandlers implements JavaLogLevelHandler {
2626
FINE(Level.FINE),
2727
FINER(Level.FINER),
2828
FINEST(Level.FINEST),
29-
ALL(Level.ALL),
29+
ALWAYS(ESAPICustomJavaLevel.ALWAYS_LEVEL),
3030
ERROR(ESAPICustomJavaLevel.ERROR_LEVEL);
3131

3232
private final Level level;

0 commit comments

Comments
 (0)