Author: rgoers
Date: Thu Oct 28 23:06:50 2010
New Revision: 1028532
URL: http://svn.apache.org/viewvc?rev=1028532&view=rev
Log:
Allow status to be set to any log level
Modified:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml
Modified:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java?rev=1028532&r1=1028531&r2=1028532&view=diff
==============================================================================
---
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
(original)
+++
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/XMLConfiguration.java
Thu Oct 28 23:06:50 2010
@@ -56,12 +56,12 @@ public class XMLConfiguration extends Ba
Document document = builder.parse(source);
rootElement = document.getDocumentElement();
Map<String, String> attrs = processAttributes(rootNode,
rootElement);
- boolean debug = false;
+ Level status = Level.OFF;
boolean verbose = false;
for (Map.Entry<String, String> entry : attrs.entrySet()) {
- if ("debug".equalsIgnoreCase(entry.getKey())) {
- debug = Boolean.parseBoolean(entry.getValue());
+ if ("status".equalsIgnoreCase(entry.getKey())) {
+ status = Level.toLevel(entry.getValue().toUpperCase(),
Level.OFF);
} else if ("verbose".equalsIgnoreCase(entry.getKey())) {
verbose = Boolean.parseBoolean(entry.getValue());
} else if ("packages".equalsIgnoreCase(entry.getKey())) {
@@ -73,8 +73,8 @@ public class XMLConfiguration extends Ba
setName(entry.getValue());
}
}
- if (debug) {
- StatusConsoleListener listener = new
StatusConsoleListener(Level.DEBUG);
+ if (status != Level.OFF) {
+ StatusConsoleListener listener = new
StatusConsoleListener(status);
if (!verbose) {
listener.setFilters(verboseClasses);
}
Modified:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml?rev=1028532&r1=1028531&r2=1028532&view=diff
==============================================================================
---
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml
(original)
+++
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/test/resources/log4j-test1.xml
Thu Oct 28 23:06:50 2010
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration packages="" debug="true" name="XMLConfigTest">
+<configuration packages="" status="debug" name="XMLConfigTest">
<properties>
<property name="filename">target/test.log</property>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
