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/06/30 08:07:47 UTC

svn commit: r1355642 - in /zookeeper/branches/branch-3.4: CHANGES.txt bin/zkServer.sh

Author: phunt
Date: Sat Jun 30 06:07:46 2012
New Revision: 1355642

URL: http://svn.apache.org/viewvc?rev=1355642&view=rev
Log:
ZOOKEEPER-1490. If the configured log directory does not exist zookeeper will not start. Better to create the directory and start (suja s via phunt)

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

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1355642&r1=1355641&r2=1355642&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Sat Jun 30 06:07:46 2012
@@ -61,6 +61,10 @@ BUGFIXES:
   ZOOKEEPER-1163. Memory leak in zk_hashtable.c:do_insert_watcher_object()
   (Anupam Chanda via michim)
 
+  ZOOKEEPER-1490. If the configured log directory does not exist
+    zookeeper will not start. Better to create the directory and start
+    (suja s via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1389. it would be nice if start-foreground used exec $JAVA

Modified: zookeeper/branches/branch-3.4/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/bin/zkServer.sh?rev=1355642&r1=1355641&r2=1355642&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/bin/zkServer.sh (original)
+++ zookeeper/branches/branch-3.4/bin/zkServer.sh Sat Jun 30 06:07:46 2012
@@ -91,6 +91,10 @@ else
     mkdir -p $(dirname "$ZOOPIDFILE")
 fi
 
+if [ ! -w "$ZOO_LOG_DIR" ] ; then
+mkdir -p "$ZOO_LOG_DIR"
+fi
+
 _ZOO_DAEMON_OUT="$ZOO_LOG_DIR/zookeeper.out"
 
 case $1 in