Use logback setting for 'cassandra -v' command patch by yukim; reviewed by Paulo Motta for CASSANDRA-10767
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/757e314c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/757e314c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/757e314c Branch: refs/heads/cassandra-3.0 Commit: 757e314cefd53d5f0d6a459be6f7e511a1a6fea0 Parents: 434dfc9 Author: Yuki Morishita <[email protected]> Authored: Wed Feb 17 10:26:08 2016 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Feb 17 10:26:08 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cassandra | 2 +- bin/cassandra.ps1 | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/757e314c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 55f806c..c40c3ce 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.14 + * Use logback setting for 'cassandra -v' command (CASSANDRA-10767) * Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714) * Fix incorrect warning in 'nodetool status' (CASSANDRA-10176) * Properly release sstable ref when doing offline scrub (CASSANDRA-10697) http://git-wip-us.apache.org/repos/asf/cassandra/blob/757e314c/bin/cassandra ---------------------------------------------------------------------- diff --git a/bin/cassandra b/bin/cassandra index 8d7b14f..4dca73e 100755 --- a/bin/cassandra +++ b/bin/cassandra @@ -182,7 +182,7 @@ while true; do exit 0 ;; -v) - "$JAVA" -cp "$CLASSPATH" org.apache.cassandra.tools.GetVersion + "$JAVA" -cp "$CLASSPATH" "-Dlogback.configurationFile=logback-tools.xml" org.apache.cassandra.tools.GetVersion exit 0 ;; -D) http://git-wip-us.apache.org/repos/asf/cassandra/blob/757e314c/bin/cassandra.ps1 ---------------------------------------------------------------------- diff --git a/bin/cassandra.ps1 b/bin/cassandra.ps1 index 41ea7c1..d9af6e6 100644 --- a/bin/cassandra.ps1 +++ b/bin/cassandra.ps1 @@ -184,7 +184,7 @@ Function PrintVersion() $pinfo = New-Object System.Diagnostics.ProcessStartInfo $pinfo.FileName = "$env:JAVA_BIN" $pinfo.UseShellExecute = $false - $pinfo.Arguments = "-cp $env:CLASSPATH org.apache.cassandra.tools.GetVersion" + $pinfo.Arguments = "-Dlogback.configurationFile=logback-tools.xml -cp $env:CLASSPATH org.apache.cassandra.tools.GetVersion" $p = New-Object System.Diagnostics.Process $p.StartInfo = $pinfo $p.Start() | Out-Null
