Return-Path: X-Original-To: apmail-zookeeper-commits-archive@www.apache.org Delivered-To: apmail-zookeeper-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DE63517A8E for ; Wed, 25 Mar 2015 07:49:10 +0000 (UTC) Received: (qmail 5136 invoked by uid 500); 25 Mar 2015 07:48:55 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 5105 invoked by uid 500); 25 Mar 2015 07:48:55 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 5092 invoked by uid 99); 25 Mar 2015 07:48:54 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Mar 2015 07:48:54 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id C9C9AAC01AB for ; Wed, 25 Mar 2015 07:48:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1669062 - in /zookeeper/trunk: CHANGES.txt src/java/main/org/apache/zookeeper/ClientCnxn.java Date: Wed, 25 Mar 2015 07:48:54 -0000 To: commits@zookeeper.apache.org From: michim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150325074854.C9C9AAC01AB@hades.apache.org> Author: michim Date: Wed Mar 25 07:48:54 2015 New Revision: 1669062 URL: http://svn.apache.org/r1669062 Log: ZOOKEEPER-2149 Logging of client address when socket connection established (Hongchao Deng via michim) 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=1669062&r1=1669061&r2=1669062&view=diff ============================================================================== --- zookeeper/trunk/CHANGES.txt (original) +++ zookeeper/trunk/CHANGES.txt Wed Mar 25 07:48:54 2015 @@ -93,6 +93,9 @@ IMPROVEMENTS: ZOOKEEPER-2107 zookeeper client should support custom HostProviders (Robert Kamphuis via rakeshr) + ZOOKEEPER-2149 Logging of client address when socket connection established + (Hongchao Deng via michim) + 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=1669062&r1=1669061&r2=1669062&view=diff ============================================================================== --- zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java (original) +++ zookeeper/trunk/src/java/main/org/apache/zookeeper/ClientCnxn.java Wed Mar 25 07:48:54 2015 @@ -965,9 +965,9 @@ public class ClientCnxn { * Setup session, previous watches, authentication. */ void primeConnection() throws IOException { - LOG.info("Socket connection established to " - + clientCnxnSocket.getRemoteSocketAddress() - + ", initiating session"); + LOG.info("Socket connection established, initiating session, client: {}, server: {}", + clientCnxnSocket.getLocalSocketAddress(), + clientCnxnSocket.getRemoteSocketAddress()); isFirstConnect = false; long sessId = (seenRwServerBefore) ? sessionId : 0; ConnectRequest conReq = new ConnectRequest(0, lastZxid,