Updated Branches: refs/heads/trunk bef7146c7 -> 379212d5d
Fix logback config in scripts and packaging. Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/379212d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/379212d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/379212d5 Branch: refs/heads/trunk Commit: 379212d5deb2f0a3c399fc447808b2de2559341d Parents: bef7146 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 10 09:31:12 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 10 09:31:12 2014 -0600 ---------------------------------------------------------------------- bin/cassandra | 2 +- bin/cassandra-cli | 2 +- bin/cassandra-shuffle | 2 +- bin/cassandra.bat | 3 +- bin/debug-cql | 2 +- bin/debug-cql.bat | 2 +- bin/json2sstable | 2 +- bin/json2sstable.bat | 2 +- bin/nodetool | 2 +- bin/nodetool.bat | 2 +- bin/sstable2json | 2 +- bin/sstable2json.bat | 2 +- bin/sstablekeys | 2 +- bin/sstablekeys.bat | 2 +- bin/sstableloader | 2 +- bin/sstableloader.bat | 2 +- bin/sstablescrub | 2 +- bin/sstablescrub.bat | 2 +- bin/sstablesplit | 2 +- bin/sstablesplit.bat | 2 +- bin/sstableupgrade | 2 +- bin/sstableupgrade.bat | 2 +- conf/README.txt | 2 +- conf/logback-tools.xml | 14 +++++++ conf/logback.xml | 2 +- debian/cassandra.install | 4 +- test/conf/log4j-junit.properties | 40 -------------------- .../org/apache/cassandra/pig/PigTestBase.java | 2 +- test/resources/functions/install_cassandra.sh | 2 +- tools/bin/sstablelevelreset | 2 +- tools/bin/sstablemetadata | 2 +- 31 files changed, 44 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/cassandra ---------------------------------------------------------------------- diff --git a/bin/cassandra b/bin/cassandra index c4c2ec2..f34ca8c 100755 --- a/bin/cassandra +++ b/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" http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/cassandra-cli ---------------------------------------------------------------------- diff --git a/bin/cassandra-cli b/bin/cassandra-cli index ea52b8e..80069d4 100755 --- a/bin/cassandra-cli +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/cassandra-shuffle ---------------------------------------------------------------------- diff --git a/bin/cassandra-shuffle b/bin/cassandra-shuffle index 53636f7..31975d4 100755 --- a/bin/cassandra-shuffle +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/cassandra.bat ---------------------------------------------------------------------- diff --git a/bin/cassandra.bat b/bin/cassandra.bat index 8a3bf7f..e11c0ba 100644 --- a/bin/cassandra.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/debug-cql ---------------------------------------------------------------------- diff --git a/bin/debug-cql b/bin/debug-cql index aa6630f..b4ebb82 100755 --- a/bin/debug-cql +++ b/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 $? http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/debug-cql.bat ---------------------------------------------------------------------- diff --git a/bin/debug-cql.bat b/bin/debug-cql.bat index d936f0a..64b3cb9 100644 --- a/bin/debug-cql.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/json2sstable ---------------------------------------------------------------------- diff --git a/bin/json2sstable b/bin/json2sstable index b1bb069..fff559f 100755 --- a/bin/json2sstable +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/json2sstable.bat ---------------------------------------------------------------------- diff --git a/bin/json2sstable.bat b/bin/json2sstable.bat index dc1e8f6..291fd22 100644 --- a/bin/json2sstable.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/nodetool ---------------------------------------------------------------------- diff --git a/bin/nodetool b/bin/nodetool index 31647e1..8642c0d 100755 --- a/bin/nodetool +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/nodetool.bat ---------------------------------------------------------------------- diff --git a/bin/nodetool.bat b/bin/nodetool.bat index 2f74687..9247ac4 100644 --- a/bin/nodetool.bat +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstable2json ---------------------------------------------------------------------- diff --git a/bin/sstable2json b/bin/sstable2json index 142bd3e..bcd346c 100755 --- a/bin/sstable2json +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstable2json.bat ---------------------------------------------------------------------- diff --git a/bin/sstable2json.bat b/bin/sstable2json.bat index 9544e0c..b67c7ad 100644 --- a/bin/sstable2json.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstablekeys ---------------------------------------------------------------------- diff --git a/bin/sstablekeys b/bin/sstablekeys index 9033881..34f3d1b 100755 --- a/bin/sstablekeys +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstablekeys.bat ---------------------------------------------------------------------- diff --git a/bin/sstablekeys.bat b/bin/sstablekeys.bat index 6a483ba..38e875c 100644 --- a/bin/sstablekeys.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstableloader ---------------------------------------------------------------------- diff --git a/bin/sstableloader b/bin/sstableloader index 85335d2..cd4598e 100755 --- a/bin/sstableloader +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstableloader.bat ---------------------------------------------------------------------- diff --git a/bin/sstableloader.bat b/bin/sstableloader.bat index 5678693..b1a1a83 100644 --- a/bin/sstableloader.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstablescrub ---------------------------------------------------------------------- diff --git a/bin/sstablescrub b/bin/sstablescrub index 31ecf02..3b7ca6c 100755 --- a/bin/sstablescrub +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstablescrub.bat ---------------------------------------------------------------------- diff --git a/bin/sstablescrub.bat b/bin/sstablescrub.bat index 06f4c84..0226e1d 100644 --- a/bin/sstablescrub.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstablesplit ---------------------------------------------------------------------- diff --git a/bin/sstablesplit b/bin/sstablesplit index 81a4232..13a81ef 100755 --- a/bin/sstablesplit +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstablesplit.bat ---------------------------------------------------------------------- diff --git a/bin/sstablesplit.bat b/bin/sstablesplit.bat index ef88670..16ccac1 100644 --- a/bin/sstablesplit.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstableupgrade ---------------------------------------------------------------------- diff --git a/bin/sstableupgrade b/bin/sstableupgrade index 5421786..bca52c3 100755 --- a/bin/sstableupgrade +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/bin/sstableupgrade.bat ---------------------------------------------------------------------- diff --git a/bin/sstableupgrade.bat b/bin/sstableupgrade.bat index 8c7892d..5fa2230 100644 --- a/bin/sstableupgrade.bat +++ b/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 ***** http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/conf/README.txt ---------------------------------------------------------------------- diff --git a/conf/README.txt b/conf/README.txt index c3fd98d..8e9e95a 100644 --- a/conf/README.txt +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/conf/logback-tools.xml ---------------------------------------------------------------------- diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml new file mode 100644 index 0000000..c472ae4 --- /dev/null +++ b/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> http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/conf/logback.xml ---------------------------------------------------------------------- diff --git a/conf/logback.xml b/conf/logback.xml index c4dd3eb..655bcf6 100644 --- a/conf/logback.xml +++ b/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> http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/debian/cassandra.install ---------------------------------------------------------------------- diff --git a/debian/cassandra.install b/debian/cassandra.install index e0182a7..ff50457 100644 --- a/debian/cassandra.install +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/test/conf/log4j-junit.properties ---------------------------------------------------------------------- diff --git a/test/conf/log4j-junit.properties b/test/conf/log4j-junit.properties deleted file mode 100644 index 3bc0c1a..0000000 --- a/test/conf/log4j-junit.properties +++ /dev/null @@ -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 - http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/test/pig/org/apache/cassandra/pig/PigTestBase.java ---------------------------------------------------------------------- diff --git a/test/pig/org/apache/cassandra/pig/PigTestBase.java b/test/pig/org/apache/cassandra/pig/PigTestBase.java index 2335023..83dc63b 100644 --- a/test/pig/org/apache/cassandra/pig/PigTestBase.java +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/test/resources/functions/install_cassandra.sh ---------------------------------------------------------------------- diff --git a/test/resources/functions/install_cassandra.sh b/test/resources/functions/install_cassandra.sh index 59f3e98..278c122 100644 --- a/test/resources/functions/install_cassandra.sh +++ b/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 http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/tools/bin/sstablelevelreset ---------------------------------------------------------------------- diff --git a/tools/bin/sstablelevelreset b/tools/bin/sstablelevelreset index a6fb33b..f6b3b1e 100755 --- a/tools/bin/sstablelevelreset +++ b/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 "$@" http://git-wip-us.apache.org/repos/asf/cassandra/blob/379212d5/tools/bin/sstablemetadata ---------------------------------------------------------------------- diff --git a/tools/bin/sstablemetadata b/tools/bin/sstablemetadata index 5fe8cc4..d9d8d6f 100755 --- a/tools/bin/sstablemetadata +++ b/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 "$@"
