You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2012/05/17 18:38:01 UTC
svn commit: r1339698 - in /zookeeper/bookkeeper/trunk: ./
bookkeeper-server/bin/ bookkeeper-server/conf/ hedwig-server/bin/
hedwig-server/conf/
Author: ivank
Date: Thu May 17 16:38:00 2012
New Revision: 1339698
URL: http://svn.apache.org/viewvc?rev=1339698&view=rev
Log:
BOOKKEEPER-238: Add log4j.properties in conf/ for bin packages (ivank)
Added:
zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.properties
zookeeper/bookkeeper/trunk/hedwig-server/conf/log4j.properties
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper
zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh
zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig
zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1339698&r1=1339697&r2=1339698&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Thu May 17 16:38:00 2012
@@ -16,6 +16,8 @@ Trunk (unreleased changes)
BOOKKEEPER-72: Fix warnings issued by FindBugs (ivank)
+ BOOKKEEPER-238: Add log4j.properties in conf/ for bin packages (ivank)
+
bookkeeper-server/
BOOKKEEPER-142: Parsing last log id is wrong, which may make entry log files overwritten (Sijie Gou via ivank)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper?rev=1339698&r1=1339697&r2=1339698&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper Thu May 17 16:38:00 2012
@@ -33,6 +33,7 @@ BINDIR=`dirname "$0"`
BK_HOME=`cd $BINDIR/..;pwd`
DEFAULT_CONF=$BK_HOME/conf/bk_server.conf
+DEFAULT_LOG_CONF=$BK_HOME/conf/log4j.properties
source $BK_HOME/conf/bkenv.sh
@@ -62,8 +63,8 @@ where command is one of:
or command is the full name of a class with a defined main() method.
Environment variables:
- BOOKIE_LOG_CONF Log4j configuration file
- BOOKIE_CONF Configuration file (default: conf/bk_server.conf)
+ BOOKIE_LOG_CONF Log4j configuration file (default $DEFAULT_LOG_CONF)
+ BOOKIE_CONF Configuration file (default: $DEFAULT_CONF)
BOOKIE_EXTRA_OPTS Extra options to be passed to the jvm
BOOKIE_EXTRA_CLASSPATH Add extra paths to the bookkeeper classpath
@@ -106,10 +107,14 @@ fi
COMMAND=$1
shift
-if [ "$BOOKIE_CONF" == "" ]; then
+if [ -z "$BOOKIE_CONF" ]; then
BOOKIE_CONF=$DEFAULT_CONF
fi
+if [ -z "$BOOKIE_LOG_CONF" ]; then
+ BOOKIE_LOG_CONF=$DEFAULT_LOG_CONF
+fi
+
BOOKIE_CLASSPATH="$BOOKIE_JAR:$BOOKIE_CLASSPATH:$BOOKIE_EXTRA_CLASSPATH"
if [ "$BOOKIE_LOG_CONF" != "" ]; then
BOOKIE_CLASSPATH="`dirname $BOOKIE_LOG_CONF`:$BOOKIE_CLASSPATH"
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh?rev=1339698&r1=1339697&r2=1339698&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/conf/bkenv.sh Thu May 17 16:38:00 2012
@@ -24,3 +24,12 @@
# Configuration file of settings used in bookie server
# BOOKIE_CONF=
+
+# Log4j configuration file
+# BOOKIE_LOG_CONF=
+
+# Extra options to be passed to the jvm
+# BOOKIE_EXTRA_OPTS=
+
+# Add extra paths to the bookkeeper classpath
+# BOOKIE_EXTRA_CLASSPATH=
Added: zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.properties
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.properties?rev=1339698&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.properties (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.properties Thu May 17 16:38:00 2012
@@ -0,0 +1,72 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+#
+# Hedwig Logging Configuration
+#
+
+# Format is "<default threshold> (, <appender>)+
+
+# DEFAULT: console appender only
+log4j.rootLogger=WARN, CONSOLE
+
+# Example with rolling log file
+#log4j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE
+
+# Example with rolling log file and tracing
+#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+
+#
+# Log INFO level and above messages to the console
+#
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+#
+# Add ROLLINGFILE to rootLogger to get log file output
+# Log DEBUG level and above messages to a log file
+log4j.appender.ROLLINGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ROLLINGFILE.Threshold=INFO
+log4j.appender.ROLLINGFILE.File=bookkeeper-server.log
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+# Max log file size of 10MB
+log4j.appender.ROLLINGFILE.MaxFileSize=10MB
+# uncomment the next line to limit number of backup files
+#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
+
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
+
+
+#
+# Add TRACEFILE to rootLogger to get log file output
+# Log DEBUG level and above messages to a log file
+log4j.appender.TRACEFILE=org.apache.log4j.FileAppender
+log4j.appender.TRACEFILE.Threshold=TRACE
+log4j.appender.TRACEFILE.File=bookkeeper-trace.log
+
+log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
+### Notice we are including log4j's NDC here (%x)
+log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n
Modified: zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig?rev=1339698&r1=1339697&r2=1339698&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/bin/hedwig Thu May 17 16:38:00 2012
@@ -33,6 +33,7 @@ BINDIR=`dirname "$0"`
HW_HOME=`cd $BINDIR/..;pwd`
DEFAULT_CONF=$HW_HOME/conf/hw_server.conf
+DEFAULT_LOG_CONF=$HW_HOME/conf/log4j.properties
. $HW_HOME/conf/hwenv.sh
@@ -88,10 +89,10 @@ or command is the full name of a class w
Environment variables:
HEDWIG_SERVER_CONF Hedwig server configuration file (default $DEFAULT_CONF)
HEDWIG_CONSOLE_SERVER_CONF Server part configuration for hedwig console,
- used for metadata management (default it is same as HEDWIG_SERVER_CONF)
+ used for metadata management (defaults to HEDWIG_SERVER_CONF)
HEDWIG_CONSOLE_CLIENT_CONF Client part configuration for hedwig console,
used for interacting with hub server.
- HEDWIG_LOG_CONF Log4j configuration file
+ HEDWIG_LOG_CONF Log4j configuration file (default $DEFAULT_LOG_CONF)
HEDWIG_EXTRA_OPTS Extra options to be passed to the jvm
These variable can also be set in conf/hwenv.sh
@@ -108,10 +109,14 @@ fi
COMMAND=$1
shift
-if [ "$HEDWIG_SERVER_CONF" == "" ]; then
+if [ -z "$HEDWIG_SERVER_CONF" ]; then
HEDWIG_SERVER_CONF=$DEFAULT_CONF;
fi
+if [ -z "$HEDWIG_LOG_CONF" ]; then
+ HEDWIG_LOG_CONF=$DEFAULT_LOG_CONF
+fi
+
HEDWIG_CLASSPATH="$HEDWIG_JAR:$HEDWIG_CLASSPATH"
if [ "$HEDWIG_LOG_CONF" != "" ]; then
Modified: zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh?rev=1339698&r1=1339697&r2=1339698&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/conf/hwenv.sh Thu May 17 16:38:00 2012
@@ -21,4 +21,18 @@
# */
# default settings for starting hedwig
-#HEDWIG_SERVER_CONF=
\ No newline at end of file
+#HEDWIG_SERVER_CONF=
+
+# Server part configuration for hedwig console,
+# used for metadata management
+# HEDWIG_CONSOLE_SERVER_CONF=
+
+# Client part configuration for hedwig console,
+# used for interacting with hub server.
+# HEDWIG_CONSOLE_CLIENT_CONF=
+
+# Log4j configuration file
+# HEDWIG_LOG_CONF=
+
+# Extra options to be passed to the jvm
+# HEDWIG_EXTRA_OPTS=
Added: zookeeper/bookkeeper/trunk/hedwig-server/conf/log4j.properties
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/conf/log4j.properties?rev=1339698&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/conf/log4j.properties (added)
+++ zookeeper/bookkeeper/trunk/hedwig-server/conf/log4j.properties Thu May 17 16:38:00 2012
@@ -0,0 +1,72 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+#
+# Hedwig Logging Configuration
+#
+
+# Format is "<default threshold> (, <appender>)+
+
+# DEFAULT: console appender only
+log4j.rootLogger=WARN, CONSOLE
+
+# Example with rolling log file
+#log4j.rootLogger=DEBUG, CONSOLE, ROLLINGFILE
+
+# Example with rolling log file and tracing
+#log4j.rootLogger=TRACE, CONSOLE, ROLLINGFILE, TRACEFILE
+
+#
+# Log INFO level and above messages to the console
+#
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=INFO
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+#
+# Add ROLLINGFILE to rootLogger to get log file output
+# Log DEBUG level and above messages to a log file
+log4j.appender.ROLLINGFILE=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.ROLLINGFILE.Threshold=INFO
+log4j.appender.ROLLINGFILE.File=hedwig-server.log
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p - [%t:%C{1}@%L] - %m%n
+
+# Max log file size of 10MB
+log4j.appender.ROLLINGFILE.MaxFileSize=10MB
+# uncomment the next line to limit number of backup files
+#log4j.appender.ROLLINGFILE.MaxBackupIndex=10
+
+log4j.appender.ROLLINGFILE.layout=org.apache.log4j.PatternLayout
+log4j.appender.ROLLINGFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L] - %m%n
+
+
+#
+# Add TRACEFILE to rootLogger to get log file output
+# Log DEBUG level and above messages to a log file
+log4j.appender.TRACEFILE=org.apache.log4j.FileAppender
+log4j.appender.TRACEFILE.Threshold=TRACE
+log4j.appender.TRACEFILE.File=hedwig-trace.log
+
+log4j.appender.TRACEFILE.layout=org.apache.log4j.PatternLayout
+### Notice we are including log4j's NDC here (%x)
+log4j.appender.TRACEFILE.layout.ConversionPattern=%d{ISO8601} - %-5p [%t:%C{1}@%L][%x] - %m%n