Fix logback config in scripts and packaging.

Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530

bin/cassandra

@@ -133,7 +133,7 @@ launch_service()
     foreground="$2"
     props="$3"
     class="$4"
-    cassandra_parms="-Dlog4j.configuration=log4j-server.properties -Dlog4j.defaultInitOverride=true"
+    cassandra_parms="-Dlogback.configurationFile=logback.xml"
 
     if [ "x$pidpath" != "x" ]; then
         cassandra_parms="$cassandra_parms -Dcassandra-pidfile=$pidpath"

bin/cassandra-cli

@@ -44,7 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" -ea -cp "$CLASSPATH" -Xmx256M \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.cli.CliMain "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/cassandra-shuffle

@@ -51,7 +51,7 @@ esac
 
 "$JAVA" -cp "$CLASSPATH" \
       -Xmx32m \
-      -Dlog4j.configuration=log4j-tools.properties \
+      -Dlogback.configurationFile=logback-tools.xml \
       org.apache.cassandra.tools.Shuffle $@
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/cassandra.bat

@@ -44,8 +44,7 @@ set JAVA_OPTS=-ea^
  -Dcom.sun.management.jmxremote.port=7199^
  -Dcom.sun.management.jmxremote.ssl=false^
  -Dcom.sun.management.jmxremote.authenticate=false^
- -Dlog4j.configuration=log4j-server.properties^
- -Dlog4j.defaultInitOverride=true
+ -Dlogback.configurationFile=logback.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/debug-cql

@@ -57,7 +57,7 @@ case "`uname`" in
 esac
 
 class="org.apache.cassandra.transport.Client"
-cassandra_parms="-Dlog4j.configuration=log4j-tools.properties"
+cassandra_parms="-Dlogback.configurationFile=logback-tools.xml"
 "$JAVA" $JVM_OPTS $cassandra_parms  -cp "$CLASSPATH" "$class" $1 $2
 
 exit $?

bin/debug-cql.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/json2sstable

@@ -44,7 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableImport "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/json2sstable.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/nodetool

@@ -88,7 +88,7 @@ esac
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" \
       -Xmx32m \
-      -Dlog4j.configuration=log4j-tools.properties \
+      -Dlogback.configurationFile=logback-tools.xml \
       -Dstorage-config="$CASSANDRA_CONF" \
       org.apache.cassandra.tools.NodeCmd -p $JMX_PORT $ARGS
 

bin/nodetool.bat

@@ -38,7 +38,7 @@ goto runNodeTool
 
 :runNodeTool
 echo Starting NodeTool
-"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% -Dlog4j.configuration=log4j-tools.properties org.apache.cassandra.tools.NodeCmd %*
+"%JAVA_HOME%\bin\java" -cp %CASSANDRA_CLASSPATH% -Dlogback.configurationFile=logback-tools.xml org.apache.cassandra.tools.NodeCmd %*
 goto finally
 
 :err

bin/sstable2json

@@ -45,7 +45,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableExport "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/sstable2json.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/sstablekeys

@@ -49,7 +49,7 @@ if [ $# -eq "0" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -cp "$CLASSPATH" -Dstorage-config="$CASSANDRA_CONF" \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableExport "$@" -e
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/sstablekeys.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/sstableloader

@@ -44,7 +44,7 @@ if [ -z "$CLASSPATH" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx256M \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.BulkLoader "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/sstableloader.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/sstablescrub

@@ -48,7 +48,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
 fi
 
 "$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" -Xmx$MAX_HEAP_SIZE \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.StandaloneScrubber "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/sstablescrub.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/sstablesplit

@@ -44,7 +44,7 @@ if [ -z $CLASSPATH ]; then
 fi
 
 $JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx256M \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.StandaloneSplitter "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/sstablesplit.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

bin/sstableupgrade

@@ -48,7 +48,7 @@ if [ "x$MAX_HEAP_SIZE" = "x" ]; then
 fi
 
 $JAVA $JAVA_AGENT -ea -cp $CLASSPATH -Xmx$MAX_HEAP_SIZE \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.StandaloneUpgrader "$@"
 
 # vi:ai sw=4 ts=4 tw=0 et

bin/sstableupgrade.bat

@@ -24,7 +24,7 @@ if NOT DEFINED JAVA_HOME goto :err
 
 REM ***** JAVA options *****
 set JAVA_OPTS=^
- -Dlog4j.configuration=log4j-tools.properties
+ -Dlogback.configurationFile=logback-tools.xml
 
 REM ***** CLASSPATH library setting *****
 

conf/README.txt

@@ -2,7 +2,7 @@ Required configuration files
 ============================
 
 cassandra.yaml: main Cassandra configuration file
-log4j-server.proprties: log4j configuration file for Cassandra server
+logback.xml: logback configuration file for Cassandra server
 
 
 Optional configuration files

conf/logback-tools.xml

@@ -0,0 +1,14 @@
+<configuration>
+  <appender name="STDERR" target="System.err" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern>
+    </encoder>
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>WARN</level>
+    </filter>
+  </appender>
+
+  <root level="WARN">
+    <appender-ref ref="STDERR" />
+  </root>
+</configuration>

conf/logback.xml

@@ -30,5 +30,5 @@
     <appender-ref ref="STDOUT" />
   </root>
   
-  <logger name="org.apache.thrift.server.TNonblockingServer" level="ERROR"/>
+  <logger name="com.thinkaurelius.thrift" level="ERROR"/>
 </configuration>

debian/cassandra.install

@@ -1,11 +1,11 @@
 conf/cassandra-topology.yaml etc/cassandra
-conf/log4j-server.properties etc/cassandra
 conf/cassandra.yaml etc/cassandra
 conf/cassandra-env.sh etc/cassandra
 conf/cassandra-rackdc.properties etc/cassandra
 conf/commitlog_archiving.properties etc/cassandra
 conf/cassandra-topology.properties etc/cassandra
-conf/log4j-tools.properties etc/cassandra
+conf/logback.xml etc/cassandra
+conf/logback-tools.xml etc/cassandra
 conf/triggers/* etc/cassandra/triggers
 debian/cassandra.in.sh usr/share/cassandra
 debian/cassandra.conf etc/security/limits.d

test/conf/log4j-junit.properties

@@ -1,40 +0,0 @@
-# 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.
-
-# for production, you should probably set the root to INFO
-# and the pattern to %c instead of %l.  (%l is slower.)
-
-# output messages into a rolling log file as well as stdout
-log4j.rootLogger=DEBUG,stderr,R
-
-# stderr
-log4j.appender.stderr=org.apache.log4j.ConsoleAppender
-log4j.appender.stderr.target=System.err
-log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
-log4j.appender.stderr.layout.ConversionPattern=%5p %d{HH:mm:ss,SSS} %m%n
-log4j.appender.stderr.threshold=WARN
-
-# rolling log file
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.file.maxFileSize=20MB
-log4j.appender.file.maxBackupIndex=50
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{ISO8601} %F (line %L) %m%n
-# Edit the next line to point to your logs directory
-log4j.appender.R.File=build/test/logs/system.log
-
-log4j.logger.org.apache.hadoop=ERROR
-

test/pig/org/apache/cassandra/pig/PigTestBase.java

@@ -69,7 +69,7 @@ public class PigTestBase extends SchemaLoader
 
     static
     {
-        System.setProperty("log4j.configuration", "log4j-junit.properties");
+        System.setProperty("logback.configurationFile", "logback-test.xml");
     }
 
     @AfterClass

test/resources/functions/install_cassandra.sh

@@ -35,7 +35,7 @@ function install_cassandra() {
   mkdir -p /mnt/cassandra/logs
   ln -s /mnt/cassandra/logs $C_LOG_DIR
   mkdir -p $C_CONF_DIR
-  cp $CASSANDRA_HOME/conf/log4j*.properties $C_CONF_DIR
+  cp $CASSANDRA_HOME/conf/logback*.xml $C_CONF_DIR
   if [[ "0.6" == "$C_MAJOR_VERSION" ]] ; then 
     cp $CASSANDRA_HOME/conf/storage-conf.xml $C_CONF_DIR
     sed -i -e "s|CASSANDRA_CONF=\$cassandra_home/conf|CASSANDRA_CONF=$C_CONF_DIR|" $CASSANDRA_HOME/bin/cassandra.in.sh

tools/bin/sstablelevelreset

@@ -45,5 +45,5 @@ if [ -z $CLASSPATH ]; then
 fi
 
 $JAVA -cp $CLASSPATH  -Dstorage-config=$CASSANDRA_CONF \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableLevelResetter "$@"

tools/bin/sstablemetadata

@@ -42,5 +42,5 @@ else
 fi
 
 $JAVA -cp $CLASSPATH \
-        -Dlog4j.configuration=log4j-tools.properties \
+        -Dlogback.configurationFile=logback-tools.xml \
         org.apache.cassandra.tools.SSTableMetadataViewer "$@"