diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-08 13:06:46 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-11-08 13:06:46 +0100 |
commit | a68db918239497fa0d87b2c4395e9abbf2079dcb (patch) | |
tree | d816d55275eb911c18171e2bd3ca5ba467d38457 | |
parent | ec413119b13e717a74cd3740cef9f1a35258d7a9 (diff) |
Add more logging
2 files changed, 5 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java index d558555512f..b94fe4288b4 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/ZooKeeperAccessMaintainer.java @@ -7,6 +7,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.zookeeper.ZooKeeperServer; import java.time.Duration; +import java.util.logging.Logger; /** * Maintains the system property which tells ZooKeeper which nodes should have access to it. @@ -21,6 +22,7 @@ import java.time.Duration; */ public class ZooKeeperAccessMaintainer extends Maintainer { + private static final Logger log = Logger.getLogger(ZooKeeperAccessMaintainer.class.getName()); private final Curator curator; public ZooKeeperAccessMaintainer(NodeRepository nodeRepository, Curator curator, Duration maintenanceInterval) { @@ -42,6 +44,7 @@ public class ZooKeeperAccessMaintainer extends Maintainer { if (hostList.length() > 0) hostList.setLength(hostList.length()-1); // remove last comma + log.fine("On " + Runtime.getRuntime().toString()+ ": Setting " + ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY + " to " + hostList.toString()); System.setProperty(ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY, hostList.toString()); } diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java index a51d15fec79..51c9ef681a1 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/RestrictedServerCnxnFactory.java @@ -31,7 +31,7 @@ public class RestrictedServerCnxnFactory extends NIOServerCnxnFactory { String zookeeperClients = System.getProperty(ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY); if (zookeeperClients == null || zookeeperClients.isEmpty()) { - log.fine("Allowing connection to ZooKeeper from " + remoteHost + ", as " + ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY + " is not set"); + log.fine("On " + Runtime.getRuntime().toString() + ": Allowing connection to ZooKeeper from " + remoteHost + ", as " + ZooKeeperServer.ZOOKEEPER_VESPA_CLIENTS_PROPERTY + " is not set"); return super.createConnection(socket, selection); // client checking is not activated } @@ -47,7 +47,7 @@ public class RestrictedServerCnxnFactory extends NIOServerCnxnFactory { log.fine("Would reject if activated: " + errorMessage); } } - log.fine("Allowing connection to ZooKeeper from " + remoteHost + ", as it is in " + zookeeperClients); + log.fine("On " + Runtime.getRuntime().toString()+ ": Allowing connection to ZooKeeper from " + remoteHost + ", as it is in " + zookeeperClients); return super.createConnection(socket, selection); } |