Author: sdeboy
Date: Thu Aug 23 10:30:00 2007
New Revision: 569080
URL: http://svn.apache.org/viewvc?rev=569080&view=rev
Log:
- removed hostname property creation from socketappender
- added hostname property creation to socketnode13 (used by socketreceiver)
- made same change to xmlsocketnode (used by xmlsocketreceiver)
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/SocketNode13.java
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/XMLSocketNode.java
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/SocketNode13.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/SocketNode13.java?rev=569080&r1=569079&r2=569080&view=diff
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/SocketNode13.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/SocketNode13.java
Thu Aug 23 10:30:00 2007
@@ -153,8 +153,9 @@
}
if (ois != null) {
- String remoteInfo =
- socket.getInetAddress().getHostName() + ":" + socket.getPort();
+
+ String hostName = socket.getInetAddress().getHostName();
+ String remoteInfo = hostName + ":" + socket.getPort();
/**
* notify the listener that the socket has been
@@ -166,7 +167,7 @@
while (true) {
// read an event from the wire
event = (LoggingEvent) ois.readObject();
-
+ event.setProperty("hostname", hostName);
// store the known remote info in an event property
event.setProperty("log4j.remoteSourceInfo", remoteInfo);
Modified:
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/XMLSocketNode.java
URL:
http://svn.apache.org/viewvc/logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/XMLSocketNode.java?rev=569080&r1=569079&r2=569080&view=diff
==============================================================================
---
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/XMLSocketNode.java
(original)
+++
logging/log4j/companions/receivers/trunk/src/main/java/org/apache/log4j/net/XMLSocketNode.java
Thu Aug 23 10:30:00 2007
@@ -123,9 +123,9 @@
}
if (is != null) {
- String remoteInfo =
- socket.getInetAddress().getHostName() + ":" + socket.getPort();
-
+ String hostName = socket.getInetAddress().getHostName();
+ String remoteInfo = hostName + ":" + socket.getPort();
+
try {
//read data from the socket
//it's up to the individual decoder to handle incomplete event data
@@ -144,12 +144,7 @@
while (iter.hasNext()) {
LoggingEvent e = (LoggingEvent) iter.next();
-
- //if machinename property was not set (the case if properties
- //not supported by the DTD), use remoteinfo as machine name
- if (e.getProperty(Constants.HOSTNAME_KEY) == null) {
- e.setProperty(Constants.HOSTNAME_KEY, remoteInfo);
- }
+ e.setProperty(Constants.HOSTNAME_KEY, hostName);
// store the known remote info in an event property
e.setProperty("log4j.remoteSourceInfo", remoteInfo);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
