From commits-return-5520-apmail-zookeeper-commits-archive=zookeeper.apache.org@zookeeper.apache.org Sat Apr 8 22:16:36 2017 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 6EB4218E57 for ; Sat, 8 Apr 2017 22:16:36 +0000 (UTC) Received: (qmail 7463 invoked by uid 500); 8 Apr 2017 22:16:36 -0000 Delivered-To: apmail-zookeeper-commits-archive@zookeeper.apache.org Received: (qmail 7427 invoked by uid 500); 8 Apr 2017 22:16:36 -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@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 7416 invoked by uid 99); 8 Apr 2017 22:16:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Apr 2017 22:16:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 33DBFE024D; Sat, 8 Apr 2017 22:16:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hanm@apache.org To: commits@zookeeper.apache.org Message-Id: <109d3adeb7804af8b10f0071e4aa8d24@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: zookeeper git commit: ZOOKEEPER-2638: ZooKeeper should log which serverCnxnFactory is used during startup Date: Sat, 8 Apr 2017 22:16:36 +0000 (UTC) Repository: zookeeper Updated Branches: refs/heads/branch-3.4 8a0c6f421 -> a1b39d4a1 ZOOKEEPER-2638: ZooKeeper should log which serverCnxnFactory is used during startup Author: Abraham Fine Reviewers: Michael Han Closes #218 from afine/ZOOKEEPER-2638_3.4 Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/a1b39d4a Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/a1b39d4a Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/a1b39d4a Branch: refs/heads/branch-3.4 Commit: a1b39d4a152f932077bb678a7d4816df4b6fe591 Parents: 8a0c6f4 Author: Abraham Fine Authored: Sat Apr 8 15:16:43 2017 -0700 Committer: Michael Han Committed: Sat Apr 8 15:16:43 2017 -0700 ---------------------------------------------------------------------- .../main/org/apache/zookeeper/server/ServerCnxnFactory.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/a1b39d4a/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java ---------------------------------------------------------------------- diff --git a/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java b/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java index cf417f8..2a67ec5 100644 --- a/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java +++ b/src/java/main/org/apache/zookeeper/server/ServerCnxnFactory.java @@ -46,7 +46,7 @@ public abstract class ServerCnxnFactory { public void processPacket(ByteBuffer packet, ServerCnxn src); } - Logger LOG = LoggerFactory.getLogger(ServerCnxnFactory.class); + private static final Logger LOG = LoggerFactory.getLogger(ServerCnxnFactory.class); /** * The buffer will cause the connection to be close when we do a send. @@ -107,8 +107,9 @@ public abstract class ServerCnxnFactory { serverCnxnFactoryName = NIOServerCnxnFactory.class.getName(); } try { - return (ServerCnxnFactory) Class.forName(serverCnxnFactoryName) - .newInstance(); + ServerCnxnFactory serverCnxnFactory = (ServerCnxnFactory) Class.forName(serverCnxnFactoryName).newInstance(); + LOG.info("Using {} as server connection factory", serverCnxnFactoryName); + return serverCnxnFactory; } catch (Exception e) { IOException ioe = new IOException("Couldn't instantiate " + serverCnxnFactoryName);