svn commit: r906621 - in /lucene/solr/branches/cloud/src/java/org/apache/solr: cloud/SolrZkServer.java core/CoreContainer.java

[yonik]

Author: yonik
Date: Thu Feb  4 19:46:21 2010
New Revision: 906621

URL: http://svn.apache.org/viewvc?rev=906621&view=rev
Log:
improve logging info

Modified:
    lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/SolrZkServer.java
    lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java

Modified: 
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/SolrZkServer.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/SolrZkServer.java?rev=906621&r1=906620&r2=906621&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/SolrZkServer.java 
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/SolrZkServer.java 
Thu Feb  4 19:46:21 2010
@@ -119,9 +119,9 @@
     };
 
     if (zkProps.getServers().size() > 1) {
-      log.info("STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER");      
+      log.info("STARTING EMBEDDED ENSEMBLE ZOOKEEPER SERVER at port " + 
zkProps.getClientPort());
     } else {
-      log.info("STARTING EMBEDDED STANDALONE ZOOKEEPER SERVER");
+      log.info("STARTING EMBEDDED STANDALONE ZOOKEEPER SERVER at port " + 
zkProps.getClientPort());
     }
 
     zkThread.setDaemon(true);

Modified: 
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
URL: 
http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java?rev=906621&r1=906620&r2=906621&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java 
(original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java 
Thu Feb  4 19:46:21 2010
@@ -119,10 +119,13 @@
     if (zookeeperHost != null) {
       // we are ZooKeeper enabled
       try {
-        log.info("Zookeeper client=" + zookeeperHost);
         // If this is an ensemble, allow for a long connect time for other 
servers to come up
-        if (zkRun != null && zkServer.getServers().size() > 1)
+        if (zkRun != null && zkServer.getServers().size() > 1) {
           zkClientConnectTimeout = 24 * 60 * 60 * 1000;  // 1 day for embedded 
ensemble
+          log.info("Zookeeper client=" + zookeeperHost + "  Waiting for a 
quorum.");
+        } else {
+          log.info("Zookeeper client=" + zookeeperHost);          
+        }
 
         zkController = new ZkController(zookeeperHost, zkClientTimeout, 
zkClientConnectTimeout, host, hostPort, hostContext);