Author: phunt
Date: Tue Jul 6 21:50:25 2010
New Revision: 961026
URL: http://svn.apache.org/viewvc?rev=961026&view=rev
Log:
ZOOKEEPER-796. zkServer.sh should support an external PIDFILE variable
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/bin/zkServer.sh
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=961026&r1=961025&r2=961026&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Tue Jul 6 21:50:25 2010
@@ -61,6 +61,9 @@ BUGFIXES:
ZOOKEEPER-636. configure.ac has instructions which override the contents of
CFLAGS and CXXFLAGS. (Maxim P. Dementiev via phunt)
+ ZOOKEEPER-796. zkServer.sh should support an external PIDFILE variable
+ (Alex Newman via phunt)
+
IMPROVEMENTS:
ZOOKEEPER-724. Improve junit test integration - log harness information
(phunt via mahadev)
Modified: hadoop/zookeeper/trunk/bin/zkServer.sh
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/bin/zkServer.sh?rev=961026&r1=961025&r2=961026&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/bin/zkServer.sh (original)
+++ hadoop/zookeeper/trunk/bin/zkServer.sh Tue Jul 6 21:50:25 2010
@@ -69,7 +69,9 @@ fi
echo "Using config: $ZOOCFG"
-ZOOPIDFILE=$(grep dataDir "$ZOOCFG" | sed -e 's/.*=//')/zookeeper_server.pid
+if [ -z $ZOOPIDFILE ]
+ then ZOOPIDFILE=$(grep dataDir "$ZOOCFG" | sed -e
's/.*=//')/zookeeper_server.pid
+fi
case $1 in
