Browse Source

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)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1244776 13f79535-47bb-0310-9956-ffa450edef68
Patrick D. Hunt 13 years ago
parent
commit
1c3ac516c2
2 changed files with 13 additions and 2 deletions
  1. 8 1
      CHANGES.txt
  2. 5 1
      bin/zkServer.sh

+ 8 - 1
CHANGES.txt

@@ -219,7 +219,14 @@ IMPROVEMENTS:
   ZOOKEEPER-1322. Cleanup/fix logging in Quorum code. 
   (phunt via mahadev)
 
-  ZOOKEEPER-1321. Add number of client connections metric in JMX and srvr. (Neha Narkhede via camille)
+  ZOOKEEPER-1321. Add number of client connections metric in JMX and
+  srvr. (Neha Narkhede via camille)
+
+  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.4.0 - 
 
 Non-backward compatible changes:

+ 5 - 1
bin/zkServer.sh

@@ -120,7 +120,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)