svn commit: r1140017 - in /zookeeper/trunk: CHANGES.txt bin/zkServer.sh

[ma...@apache.org]

Author: mahadev
Date: Mon Jun 27 05:03:42 2011
New Revision: 1140017

URL: http://svn.apache.org/viewvc?rev=1140017&view=rev
Log:
ZOOKEEPER-1074. zkServer.sh is missing nohup/sleep, which are necessary for remote invocation. (phunt via mahadev)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/bin/zkServer.sh

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1140017&r1=1140016&r2=1140017&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Mon Jun 27 05:03:42 2011
@@ -322,6 +322,9 @@ IMPROVEMENTS:
 
   ZOOKEEPER-1094. Small improvements to LeaderElection and Vote classes (henryr via breed)
 
+  ZOOKEEPER-1074. zkServer.sh is missing nohup/sleep, which are necessary 
+  for remote invocation. (phunt via mahadev)
+
 NEW FEATURES:
   ZOOKEEPER-729. Java client API to recursively delete a subtree.
   (Kay Kay via henry)

Modified: zookeeper/trunk/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.sh?rev=1140017&r1=1140016&r2=1140017&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkServer.sh (original)
+++ zookeeper/trunk/bin/zkServer.sh Mon Jun 27 05:03:42 2011
@@ -102,12 +102,13 @@ start)
          exit 0
       fi
     fi
-    $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+    nohup $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
     -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG" > "$_ZOO_DAEMON_OUT" 2>&1 < /dev/null &
     if [ $? -eq 0 ]
     then
       if /bin/echo -n $! > "$ZOOPIDFILE"
       then
+        sleep 1
         echo STARTED
       else
         echo FAILED TO WRITE PID