Author: sdeboy
Date: Sat Jun 12 06:20:57 2010
New Revision: 953945
URL: http://svn.apache.org/viewvc?rev=953945&view=rev
Log:
Fix Bug 49421: Chainsaw don't show Logger for SocketReceiver and
SocketHubReceiver
All calls to the LoggingEvent constructor which pass in another event's Logger
may only have a categoryName field and not logger field available - updated
calls to LoggingEvent constructor to ensure logger was passed in if not null,
or a logger was created from the logger name (pre-existing bug in rewritepolicy
classes if they were used with socketappender/receiver).
Also (arbitrarily) updated Chainsaw revision in the pom.xml 2.1.0, in order to
keep folks from being confused that this latest version is the original 2.0
(which according to maven was previously 1.99)
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java?rev=953945&r1=953944&r2=953945&view=diff
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/MapRewritePolicy.java
Sat Jun 12 06:20:57 2010
@@ -16,11 +16,11 @@
*/
package org.apache.log4j.rewrite;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
-import org.apache.log4j.rewrite.RewritePolicy;
+import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
/**
@@ -68,7 +68,7 @@ public class MapRewritePolicy implements
return new LoggingEvent(
source.getFQNOfLoggerClass(),
- source.getLogger(),
+ source.getLogger() != null ? source.getLogger():
Logger.getLogger(source.getLoggerName()),
source.getTimeStamp(),
source.getLevel(),
newMsg,
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java?rev=953945&r1=953944&r2=953945&view=diff
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/PropertyRewritePolicy.java
Sat Jun 12 06:20:57 2010
@@ -16,15 +16,15 @@
*/
package org.apache.log4j.rewrite;
-import org.apache.log4j.spi.LoggingEvent;
-import org.apache.log4j.rewrite.RewritePolicy;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
+
/**
* This policy rewrites events by adding
* a user-specified list of properties to the event.
@@ -75,7 +75,7 @@ public class PropertyRewritePolicy imple
return new LoggingEvent(
source.getFQNOfLoggerClass(),
- source.getLogger(),
+ source.getLogger() != null ? source.getLogger():
Logger.getLogger(source.getLoggerName()),
source.getTimeStamp(),
source.getLevel(),
source.getMessage(),
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java?rev=953945&r1=953944&r2=953945&view=diff
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/rewrite/ReflectionRewritePolicy.java
Sat Jun 12 06:20:57 2010
@@ -16,12 +16,12 @@
*/
package org.apache.log4j.rewrite;
-import java.util.Map;
-import java.util.HashMap;
-import java.beans.PropertyDescriptor;
import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.util.HashMap;
+import java.util.Map;
-import org.apache.log4j.rewrite.RewritePolicy;
+import org.apache.log4j.Logger;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;
@@ -69,7 +69,7 @@ public class ReflectionRewritePolicy imp
}
return new LoggingEvent(
source.getFQNOfLoggerClass(),
- source.getLogger(),
+ source.getLogger() != null ? source.getLogger():
Logger.getLogger(source.getLoggerName()),
source.getTimeStamp(),
source.getLevel(),
newMsg,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
