mwomack 2003/03/18 23:03:35
Modified: src/java/org/apache/log4j/net SocketNode.java
JMSReceiver.java
Log:
Added code to set the property "log4j.remoteSourceInfo" in the event. For socket
related receivers, the value will be the remote host and port (as reported by the
Socket object). For JMS it will be the topic factory and topic information.
Revision Changes Path
1.26 +5 -1 jakarta-log4j/src/java/org/apache/log4j/net/SocketNode.java
Index: SocketNode.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/SocketNode.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- SocketNode.java 18 Mar 2003 13:33:32 -0000 1.25
+++ SocketNode.java 19 Mar 2003 07:03:34 -0000 1.26
@@ -8,6 +8,7 @@
package org.apache.log4j.net;
+import java.net.InetAddress;
import java.net.Socket;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -60,7 +61,6 @@
listener = _listener;
}
-
public void run() {
LoggingEvent event;
Logger remoteLogger;
@@ -77,10 +77,14 @@
}
if (ois != null) {
+ String remoteInfo = socket.getInetAddress().getHostName() + ":" +
socket.getPort();
try {
while(true) {
// read an event from the wire
event = (LoggingEvent) ois.readObject();
+
+ // store the known remote info in an event property
+ event.setProperty("log4j.remoteSourceInfo", remoteInfo);
// if configured with a receiver, tell it to post the event
if (receiver != null) {
1.3 +8 -0 jakarta-log4j/src/java/org/apache/log4j/net/JMSReceiver.java
Index: JMSReceiver.java
===================================================================
RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/net/JMSReceiver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMSReceiver.java 11 Dec 2002 07:30:31 -0000 1.2
+++ JMSReceiver.java 19 Mar 2003 07:03:34 -0000 1.3
@@ -54,6 +54,8 @@
protected String userId;
protected String password;
protected TopicConnection topicConnection;
+
+ private String remoteInfo;
public JMSReceiver() { }
@@ -153,6 +155,8 @@
public void activateOptions() {
if (!isActive()) {
try {
+ remoteInfo = topicFactoryName + ":" + topicName;
+
Context ctx = new InitialContext();
TopicConnectionFactory topicConnectionFactory;
topicConnectionFactory =
@@ -217,6 +221,10 @@
// get the logging event and post it to the repository
ObjectMessage objectMessage = (ObjectMessage) message;
LoggingEvent event = (LoggingEvent) objectMessage.getObject();
+
+ // store the known remote info in an event property
+ event.setProperty("log4j.remoteSourceInfo", remoteInfo);
+
doPost(event);
} else {
logger.warn("Received message is of type "+message.getJMSType()
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
