You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by rg...@apache.org on 2015/12/05 22:45:00 UTC

svn commit: r1718124 - in /zookeeper/branches/branch-3.5: CHANGES.txt src/java/main/org/apache/zookeeper/ClientCnxn.java

Author: rgs
Date: Sat Dec  5 21:45:00 2015
New Revision: 1718124

URL: http://svn.apache.org/viewvc?rev=1718124&view=rev
Log:
ZOOKEEPER-2326: Include connected server address:port in log
(Arshad Mohammad via rgs)

Modified:
    zookeeper/branches/branch-3.5/CHANGES.txt
    zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java

Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1718124&r1=1718123&r2=1718124&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Sat Dec  5 21:45:00 2015
@@ -82,6 +82,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.1 - 07/27/2015
 
 NEW FEATURES:

Modified: zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java?rev=1718124&r1=1718123&r2=1718124&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java (original)
+++ zookeeper/branches/branch-3.5/src/java/main/org/apache/zookeeper/ClientCnxn.java Sat Dec  5 21:45:00 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(