svn commit: r1422173 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/bin/bookkeeper bookkeeper-server/conf/log4j.shell.properties

[si...@apache.org]

Author: sijie
Date: Sat Dec 15 01:45:06 2012
New Revision: 1422173

URL: http://svn.apache.org/viewvc?rev=1422173&view=rev
Log:
BOOKKEEPER-511: BookieShell is very noisy (ivank via sijie)

Added:
    zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.shell.properties
Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1422173&r1=1422172&r2=1422173&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Dec 15 01:45:06 2012
@@ -254,6 +254,8 @@ Trunk (unreleased changes)
 
 	BOOKKEEPER-428: Expose command options in bookie scripts to disable/enable auto recovery temporarily (rakesh,ivank via fpj)
 
+        BOOKKEEPER-511: BookieShell is very noisy (ivank via sijie)
+
       hedwig-server:
 
         BOOKKEEPER-250: Need a ledger manager like interface to manage metadata operations in Hedwig (sijie via ivank)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper?rev=1422173&r1=1422172&r2=1422173&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/bin/bookkeeper Sat Dec 15 01:45:06 2012
@@ -132,6 +132,10 @@ fi
 COMMAND=$1
 shift
 
+if [ $COMMAND == "shell" ]; then
+    DEFAULT_LOG_CONF=$BK_HOME/conf/log4j.shell.properties
+fi
+
 if [ -z "$BOOKIE_CONF" ]; then
     BOOKIE_CONF=$DEFAULT_CONF
 fi
@@ -141,10 +145,9 @@ if [ -z "$BOOKIE_LOG_CONF" ]; then
 fi
 
 BOOKIE_CLASSPATH="$BOOKIE_JAR:$BOOKIE_CLASSPATH:$BOOKIE_EXTRA_CLASSPATH"
-if [ "$BOOKIE_LOG_CONF" != "" ]; then
-    BOOKIE_CLASSPATH="`dirname $BOOKIE_LOG_CONF`:$BOOKIE_CLASSPATH"
-    OPTS="$OPTS -Dlog4j.configuration=`basename $BOOKIE_LOG_CONF`"
-fi
+BOOKIE_CLASSPATH="`dirname $BOOKIE_LOG_CONF`:$BOOKIE_CLASSPATH"
+OPTS="$OPTS -Dlog4j.configuration=`basename $BOOKIE_LOG_CONF`"
+
 OPTS="-cp $BOOKIE_CLASSPATH $OPTS $BOOKIE_EXTRA_OPTS"
 
 OPTS="$OPTS $BOOKIE_EXTRA_OPTS"

Added: zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.shell.properties
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.shell.properties?rev=1422173&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.shell.properties (added)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/conf/log4j.shell.properties Sat Dec 15 01:45:06 2012
@@ -0,0 +1,41 @@
+#
+#
+# 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.
+#
+#
+
+#
+# BookieShell configuration
+
+# DEFAULT: console appender only
+# Define some default values that can be overridden by system properties
+bookkeeper.root.logger=ERROR,CONSOLE
+
+log4j.rootLogger=${bookkeeper.root.logger}
+
+#
+# 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{ABSOLUTE} %-5p %m%n
+
+log4j.logger.org.apache.zookeeper=ERROR
+log4j.logger.org.apache.bookkeeper=ERROR
+log4j.logger.org.apache.bookkeeper.bookie.BookieShell=INFO