You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ra...@apache.org on 2015/03/01 17:45:49 UTC
svn commit: r1663127 - in /zookeeper/trunk: CHANGES.txt bin/zkCleanup.sh
bin/zkCli.cmd bin/zkCli.sh bin/zkEnv.cmd bin/zkEnv.sh bin/zkServer.cmd
bin/zkServer.sh conf/log4j.properties
Author: rakeshr
Date: Sun Mar 1 16:45:48 2015
New Revision: 1663127
URL: http://svn.apache.org/r1663127
Log:
ZOOKEEPER-1952 Default log directory and file name can be changed(nijel, Hari Krishna Dara via rakeshr)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/bin/zkCleanup.sh
zookeeper/trunk/bin/zkCli.cmd
zookeeper/trunk/bin/zkCli.sh
zookeeper/trunk/bin/zkEnv.cmd
zookeeper/trunk/bin/zkEnv.sh
zookeeper/trunk/bin/zkServer.cmd
zookeeper/trunk/bin/zkServer.sh
zookeeper/trunk/conf/log4j.properties
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sun Mar 1 16:45:48 2015
@@ -44,6 +44,9 @@ BUGFIXES:
ZOOKEEPER-2073 Memory leak on zookeeper_close (Dave Gosselin via michim)
+ ZOOKEEPER-1952 Default log directory and file name can be changed
+ (nijel, Hari Krishna Dara via rakeshr)
+
IMPROVEMENTS:
ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)
Modified: zookeeper/trunk/bin/zkCleanup.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkCleanup.sh?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkCleanup.sh (original)
+++ zookeeper/trunk/bin/zkCleanup.sh Sun Mar 1 16:45:48 2015
@@ -39,13 +39,15 @@ fi
ZOODATADIR="$(grep "^[[:space:]]*dataDir=" "$ZOOCFG" | sed -e 's/.*=//')"
ZOODATALOGDIR="$(grep "^[[:space:]]*dataLogDir=" "$ZOOCFG" | sed -e 's/.*=//')"
+ZOO_LOG_FILE=zookeeper-$USER-cleanup-$HOSTNAME.log
+
if [ "x$ZOODATALOGDIR" = "x" ]
then
-"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \
-cp "$CLASSPATH" $JVMFLAGS \
org.apache.zookeeper.server.PurgeTxnLog "$ZOODATADIR" $*
else
-"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \
-cp "$CLASSPATH" $JVMFLAGS \
org.apache.zookeeper.server.PurgeTxnLog "$ZOODATALOGDIR" "$ZOODATADIR" $*
fi
Modified: zookeeper/trunk/bin/zkCli.cmd
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkCli.cmd?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkCli.cmd (original)
+++ zookeeper/trunk/bin/zkCli.cmd Sun Mar 1 16:45:48 2015
@@ -17,8 +17,10 @@ REM limitations under the License.
setlocal
call "%~dp0zkEnv.cmd"
+ZOO_LOG_FILE=zookeeper-%USERNAME%-cli-%COMPUTERNAME%.log
+
set ZOOMAIN=org.apache.zookeeper.ZooKeeperMain
-call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% %*
+call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" "-Dzookeeper.log.file=%ZOO_LOG_FILE%" -cp "%CLASSPATH%" %ZOOMAIN% %*
endlocal
Modified: zookeeper/trunk/bin/zkCli.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkCli.sh?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkCli.sh (original)
+++ zookeeper/trunk/bin/zkCli.sh Sun Mar 1 16:45:48 2015
@@ -36,6 +36,8 @@ else
. "$ZOOBINDIR"/zkEnv.sh
fi
-"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+ZOO_LOG_FILE=zookeeper-$USER-cli-$HOSTNAME.log
+
+"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \
-cp "$CLASSPATH" $CLIENT_JVMFLAGS $JVMFLAGS \
org.apache.zookeeper.ZooKeeperMain "$@"
Modified: zookeeper/trunk/bin/zkEnv.cmd
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkEnv.cmd?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkEnv.cmd (original)
+++ zookeeper/trunk/bin/zkEnv.cmd Sun Mar 1 16:45:48 2015
@@ -15,7 +15,7 @@ REM See the License for the specific lan
REM limitations under the License.
set ZOOCFGDIR=%~dp0%..\conf
-set ZOO_LOG_DIR=%~dp0%..
+set ZOO_LOG_DIR=%~dp0%..\logs
set ZOO_LOG4J_PROP=INFO,CONSOLE
REM for sanity sake assume Java 1.6
Modified: zookeeper/trunk/bin/zkEnv.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkEnv.sh?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkEnv.sh (original)
+++ zookeeper/trunk/bin/zkEnv.sh Sun Mar 1 16:45:48 2015
@@ -67,7 +67,7 @@ fi
if [ "x${ZOO_LOG_DIR}" = "x" ]
then
- ZOO_LOG_DIR="."
+ ZOO_LOG_DIR="$ZOOKEEPER_PREFIX/logs"
fi
if [ "x${ZOO_LOG4J_PROP}" = "x" ]
Modified: zookeeper/trunk/bin/zkServer.cmd
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.cmd?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkServer.cmd (original)
+++ zookeeper/trunk/bin/zkServer.cmd Sun Mar 1 16:45:48 2015
@@ -18,7 +18,9 @@ setlocal
call "%~dp0zkEnv.cmd"
set ZOOMAIN=org.apache.zookeeper.server.quorum.QuorumPeerMain
+set ZOO_LOG_FILE=zookeeper-%USERNAME%-server-%COMPUTERNAME%.log
+
echo on
-call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" -cp "%CLASSPATH%" %ZOOMAIN% "%ZOOCFG%" %*
+call %JAVA% "-Dzookeeper.log.dir=%ZOO_LOG_DIR%" "-Dzookeeper.root.logger=%ZOO_LOG4J_PROP%" "-Dzookeeper.log.file=%ZOO_LOG_FILE%" -cp "%CLASSPATH%" %ZOOMAIN% "%ZOOCFG%" %*
endlocal
Modified: zookeeper/trunk/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.sh?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkServer.sh (original)
+++ zookeeper/trunk/bin/zkServer.sh Sun Mar 1 16:45:48 2015
@@ -133,7 +133,8 @@ if [ ! -w "$ZOO_LOG_DIR" ] ; then
mkdir -p "$ZOO_LOG_DIR"
fi
-_ZOO_DAEMON_OUT="$ZOO_LOG_DIR/zookeeper.out"
+ZOO_LOG_FILE=zookeeper-$USER-server-$HOSTNAME.log
+_ZOO_DAEMON_OUT="$ZOO_LOG_DIR/zookeeper-$USER-server-$HOSTNAME.out"
case $1 in
start)
@@ -144,7 +145,7 @@ start)
exit 0
fi
fi
- nohup "$JAVA" $ZOO_DATADIR_AUTOCREATE "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" \
+ nohup "$JAVA" $ZOO_DATADIR_AUTOCREATE "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \
"-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
-cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG" > "$_ZOO_DAEMON_OUT" 2>&1 < /dev/null &
if [ $? -eq 0 ]
@@ -167,12 +168,12 @@ start-foreground)
if [ "${ZOO_NOEXEC}" != "" ]; then
ZOO_CMD=("$JAVA")
fi
- "${ZOO_CMD[@]}" $ZOO_DATADIR_AUTOCREATE "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" \
+ "${ZOO_CMD[@]}" $ZOO_DATADIR_AUTOCREATE "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \
"-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
-cp "$CLASSPATH" $JVMFLAGS $ZOOMAIN "$ZOOCFG"
;;
print-cmd)
- echo "\"$JAVA\" $ZOO_DATADIR_AUTOCREATE -Dzookeeper.log.dir=\"${ZOO_LOG_DIR}\" -Dzookeeper.root.logger=\"${ZOO_LOG4J_PROP}\" -cp \"$CLASSPATH\" $JVMFLAGS $ZOOMAIN \"$ZOOCFG\" > \"$_ZOO_DAEMON_OUT\" 2>&1 < /dev/null"
+ echo "\"$JAVA\" $ZOO_DATADIR_AUTOCREATE -Dzookeeper.log.dir=\"${ZOO_LOG_DIR}\" -Dzookeeper.root.logger=\"${ZOO_LOG4J_PROP}\" -Dzookeeper.log.file=\"${ZOO_LOG_FILE}\" -cp \"$CLASSPATH\" $JVMFLAGS $ZOOMAIN \"$ZOOCFG\" > \"$_ZOO_DAEMON_OUT\" 2>&1 < /dev/null"
;;
stop)
echo -n "Stopping zookeeper ... "
@@ -228,7 +229,7 @@ status)
fi
fi
echo "Client port found: $clientPort. Client address: $clientPortAddress."
- STAT=`"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
+ STAT=`"$JAVA" "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" "-Dzookeeper.log.file=${ZOO_LOG_FILE}" \
-cp "$CLASSPATH" $JVMFLAGS org.apache.zookeeper.client.FourLetterWordMain \
$clientPortAddress $clientPort srvr 2> /dev/null \
| grep Mode`
Modified: zookeeper/trunk/conf/log4j.properties
URL: http://svn.apache.org/viewvc/zookeeper/trunk/conf/log4j.properties?rev=1663127&r1=1663126&r2=1663127&view=diff
==============================================================================
--- zookeeper/trunk/conf/log4j.properties (original)
+++ zookeeper/trunk/conf/log4j.properties Sun Mar 1 16:45:48 2015
@@ -27,7 +27,7 @@ zookeeper.log.threshold=INFO
zookeeper.log.maxfilesize=256MB
zookeeper.log.maxbackupindex=20
-zookeeper.tracelog.dir=.
+zookeeper.tracelog.dir=${zookeeper.log.dir}
zookeeper.tracelog.file=zookeeper_trace.log
log4j.rootLogger=${zookeeper.root.logger}