Author: mahadev Date: Fri Dec 12 16:27:22 2008 New Revision: 726151 URL: http://svn.apache.org/viewvc?rev=726151&view=rev Log: ZOOKEEPER-225. c client should log an info message in zookeeper_init detailing connection parameters. (pat via mahadev)
Modified: hadoop/zookeeper/trunk/CHANGES.txt hadoop/zookeeper/trunk/src/c/src/zookeeper.c hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java Modified: hadoop/zookeeper/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=726151&r1=726150&r2=726151&view=diff ============================================================================== --- hadoop/zookeeper/trunk/CHANGES.txt (original) +++ hadoop/zookeeper/trunk/CHANGES.txt Fri Dec 12 16:27:22 2008 @@ -75,6 +75,9 @@ ZOOKEEPER-230. Improvements to FLE. (Flavio via mahadev) + ZOOKEEPER-225. c client should log an info message in zookeeper_init +detailing connection parameters. (pat via mahadev) + Release 3.0.0 - 2008-10-21 Non-backward compatible changes: Modified: hadoop/zookeeper/trunk/src/c/src/zookeeper.c URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/c/src/zookeeper.c?rev=726151&r1=726150&r2=726151&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/c/src/zookeeper.c (original) +++ hadoop/zookeeper/trunk/src/c/src/zookeeper.c Fri Dec 12 16:27:22 2008 @@ -487,6 +487,16 @@ { log_env(); + LOG_INFO(("Initiating client connection, host=%s sessionTimeout=%d watcher=%p" + " sessionId=0x%llx sessionPasswd=%s context=%p flags=%d", + host, + recv_timeout, + watcher, + clientid->client_id, + (clientid->passwd == 0 ? "<null>" : "<hidden>"), + context, + flags)); + int errnosave; zhandle_t *zh = calloc(1, sizeof(*zh)); if (!zh) { Modified: hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java URL: http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java?rev=726151&r1=726150&r2=726151&view=diff ============================================================================== --- hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java (original) +++ hadoop/zookeeper/trunk/src/java/main/org/apache/zookeeper/ZooKeeper.java Fri Dec 12 16:27:22 2008 @@ -314,13 +314,16 @@ volatile States state; - protected ClientCnxn cnxn; + protected final ClientCnxn cnxn; /** * @see ZooKeeper(String, int, Watcher, long, byte[]) */ public ZooKeeper(String host, int sessionTimeout, Watcher watcher) throws IOException { + LOG.info("Initiating client connection, host=" + host + + " sessionTimeout=" + sessionTimeout + " watcher=" + watcher); + watchManager.defaultWatcher = watcher; cnxn = new ClientCnxn(host, sessionTimeout, this, watchManager); } @@ -358,6 +361,13 @@ */ public ZooKeeper(String host, int sessionTimeout, Watcher watcher, long sessionId, byte[] sessionPasswd) throws IOException { + LOG.info("Initiating client connection, host=" + host + + " sessionTimeout=" + sessionTimeout + + " watcher=" + watcher + + " sessionId=" + sessionId + + " sessionPasswd=" + + (sessionPasswd == null ? "<null>" : "<hidden>")); + watchManager.defaultWatcher = watcher; cnxn = new ClientCnxn(host, sessionTimeout, this, watchManager, sessionId, sessionPasswd);