You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@bigtop.apache.org by rv...@apache.org on 2012/08/09 22:34:36 UTC

svn commit: r1371447 - /incubator/bigtop/branches/branch-0.4/bigtop-packages/src/common/zookeeper/install_zookeeper.sh

Author: rvs
Date: Thu Aug  9 20:34:35 2012
New Revision: 1371447

URL: http://svn.apache.org/viewvc?rev=1371447&view=rev
Log:
BIGTOP-668. unable to override zookeeper environment variables

Modified:
    incubator/bigtop/branches/branch-0.4/bigtop-packages/src/common/zookeeper/install_zookeeper.sh

Modified: incubator/bigtop/branches/branch-0.4/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/branch-0.4/bigtop-packages/src/common/zookeeper/install_zookeeper.sh?rev=1371447&r1=1371446&r2=1371447&view=diff
==============================================================================
--- incubator/bigtop/branches/branch-0.4/bigtop-packages/src/common/zookeeper/install_zookeeper.sh (original)
+++ incubator/bigtop/branches/branch-0.4/bigtop-packages/src/common/zookeeper/install_zookeeper.sh Thu Aug  9 20:34:35 2012
@@ -167,10 +167,10 @@ export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:
 export ZOOKEEPER_CONF=\${ZOOKEEPER_CONF:-/etc/zookeeper/conf}
 export ZOOCFGDIR=\${ZOOCFGDIR:-\$ZOOKEEPER_CONF}
 export CLASSPATH=\$CLASSPATH:\$ZOOKEEPER_CONF:\$ZOOKEEPER_HOME/*:\$ZOOKEEPER_HOME/lib/*
-export ZOO_LOG_DIR=/var/log/zookeeper
-export ZOO_LOG4J_PROP=INFO,ROLLINGFILE
-export JVMFLAGS=-Dzookeeper.log.threshold=INFO
-export ZOO_DATADIR_AUTOCREATE_DISABLE=true
+export ZOO_LOG_DIR=\${ZOO_LOG_DIR:-/var/log/zookeeper}
+export ZOO_LOG4J_PROP=\${ZOO_LOG4J_PROP:-INFO,ROLLINGFILE}
+export JVMFLAGS=\${JVMFLAGS:--Dzookeeper.log.threshold=INFO}
+export ZOO_DATADIR_AUTOCREATE_DISABLE=\${ZOO_DATADIR_AUTOCREATE_DISABLE:-true}
 env CLASSPATH=\$CLASSPATH /usr/lib/zookeeper/bin/${upstream_script} "\$@"
 EOF
   chmod 755 $wrapper