Author: rgoers
Date: Wed Oct 19 16:47:43 2011
New Revision: 1186319
URL: http://svn.apache.org/viewvc?rev=1186319&view=rev
Log:
Clean up debug output
Modified:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
Modified:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.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/BaseConfiguration.java?rev=1186319&r1=1186318&r2=1186319&view=diff
==============================================================================
---
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
(original)
+++
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/config/BaseConfiguration.java
Wed Oct 19 16:47:43 2011
@@ -595,7 +595,7 @@ public class BaseConfiguration extends F
if (parmClasses[index].isArray()) {
Class parmClass =
parmClasses[index].getComponentType();
List<Object> list = new ArrayList<Object>();
- sb.append("{");
+ sb.append(name).append("={");
boolean first = true;
for (Node child : children) {
PluginType childType = child.getType();
Modified:
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.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/filter/MarkerFilter.java?rev=1186319&r1=1186318&r2=1186319&view=diff
==============================================================================
---
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
(original)
+++
logging/log4j/branches/BRANCH_2_0_EXPERIMENTAL/rgoers/log4j2-core/src/main/java/org/apache/logging/log4j/core/filter/MarkerFilter.java
Wed Oct 19 16:47:43 2011
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.message.
* configured marker as a parent.
*
*/
-@Plugin(name="Marker", type="Core", elementType="filter")
+@Plugin(name="Marker", type="Core", elementType="filter", printObject=true)
public class MarkerFilter extends FilterBase {
private static final String LEVEL = "level";
@@ -64,6 +64,10 @@ public class MarkerFilter extends Filter
return marker != null && marker.isInstanceOf(this.marker) ? onMatch :
onMismatch;
}
+ public String toString() {
+ return marker.getName();
+ }
+
@PluginFactory
public static MarkerFilter createFilter(@PluginAttr("marker") String
marker,
@PluginAttr("onMatch") String
match,
