Author: rgs
Date: Sat Dec 5 21:43:26 2015
New Revision: 1718123
URL: http://svn.apache.org/viewvc?rev=1718123&view=rev
Log:
ZOOKEEPER-2326: Include connected server address:port in log
(Arshad Mohammad via rgs)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java
Modified: zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1718123&r1=1718122&r2=1718123&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Dec 5 21:43:26 2015
@@ -318,6 +318,9 @@ IMPROVEMENTS:
ZOOKEEPER-2240: Make the three-node minimum more explicit in documentation
and on website (Shawn Heisey via rgs)
+ ZOOKEEPER-2326: Include connected server address:port in log
+ (Arshad Mohammad via rgs)
+
Release 3.5.0 - 8/4/2014
NEW FEATURES:
Modified: zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL:
http://svn.apache.org/viewvc/zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1718123&r1=1718122&r2=1718123&view=diff
==============================================================================
--- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java
(original)
+++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java Sat Dec
5 21:43:26 2015
@@ -46,6 +46,7 @@ import javax.security.sasl.SaslException
import org.apache.jute.BinaryInputArchive;
import org.apache.jute.BinaryOutputArchive;
import org.apache.jute.Record;
+import org.apache.log4j.MDC;
import org.apache.zookeeper.AsyncCallback.ACLCallback;
import org.apache.zookeeper.AsyncCallback.Children2Callback;
import org.apache.zookeeper.AsyncCallback.ChildrenCallback;
@@ -1103,8 +1104,9 @@ public class ClientCnxn {
addr = hostProvider.next(1000);
}
- setName(getName().replaceAll("\\(.*\\)",
- "(" + addr.getHostString() + ":" + addr.getPort() + ")"));
+ String hostPort = addr.getHostString() + ":" + addr.getPort();
+ MDC.put("myid", hostPort);
+ setName(getName().replaceAll("\\(.*\\)", "(" + hostPort + ")"));
if (ZooKeeperSaslClient.isEnabled()) {
try {
String principalUserName = System.getProperty(
