You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2012/02/16 00:02:19 UTC

svn commit: r1244782 - in /zookeeper/branches/branch-3.3: CHANGES.txt bin/zkServer.sh

Author: phunt
Date: Wed Feb 15 23:02:19 2012
New Revision: 1244782

URL: http://svn.apache.org/viewvc?rev=1244782&view=rev
Log:
ZOOKEEPER-1389. it would be nice if start-foreground used exec  in order to get rid of the intermediate shell process (Roman Shaposhnik via phunt)

Modified:
    zookeeper/branches/branch-3.3/CHANGES.txt
    zookeeper/branches/branch-3.3/bin/zkServer.sh

Modified: zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1244782&r1=1244781&r2=1244782&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.3/CHANGES.txt Wed Feb 15 23:02:19 2012
@@ -21,6 +21,13 @@ BUGFIXES:
   ZOOKEEPER-1352. server.InvalidSnapshotTest is using connection timeouts 
   that are too short. (phunt via mahadev)
 
+IMPROVEMENTS:
+
+  ZOOKEEPER-1389. it would be nice if start-foreground used exec $JAVA
+  in order to get rid of the intermediate shell process
+  (Roman Shaposhnik via phunt)
+
+
 Release 3.3.4 - 2011-11-16
 Backward compatible changes:
 

Modified: zookeeper/branches/branch-3.3/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/bin/zkServer.sh?rev=1244782&r1=1244781&r2=1244782&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/bin/zkServer.sh (original)
+++ zookeeper/branches/branch-3.3/bin/zkServer.sh Wed Feb 15 23:02:19 2012
@@ -114,7 +114,11 @@ start)
     fi
     ;;
 start-foreground)
-    $JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+    ZOO_CMD="exec $JAVA"
+    if [ "${ZOO_NOEXEC}" != "" ]; then
+      ZOO_CMD="$JAVA"
+    fi
+    $ZOO_CMD "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
     -cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG"
     ;;
 print-cmd)