You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/07/27 14:38:23 UTC
cassandra git commit: Unify STDOUT and SYSTEMLOG logback format
Repository: cassandra
Updated Branches:
refs/heads/trunk 472a7c55b -> e1393ec54
Unify STDOUT and SYSTEMLOG logback format
Patch by J�r�me Mainaud; Reviewed by Paulo Motta for CASSANDRA-12004
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1393ec5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1393ec5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1393ec5
Branch: refs/heads/trunk
Commit: e1393ec54fa5525dd4bf5255d35c936be3a1c128
Parents: 472a7c5
Author: J�r�me Mainaud <je...@mainaud.com>
Authored: Tue Jul 26 16:59:27 2016 -0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Jul 27 15:38:32 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 6 +++---
conf/logback-tools.xml | 2 +-
conf/logback.xml | 2 +-
test/conf/logback-test.xml | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1393ec5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 67b5824..04b2a3f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.10
+ * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
* COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
* Faster write path (CASSANDRA-12269)
* Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1393ec5/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 0492b25..8580c7c 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -37,8 +37,9 @@ New features
Upgrading
---------
- - Nothing specific to 3.10 but please see previous versions upgrading section,
- especially if you are upgrading from 2.2.
+ - Logs written to stdout are now consistent with logs written to files.
+ Time is now local (it was UTC on the console and local in files). Date, thread, file
+ and line info where added to stdout. (see CASSANDRA-12004)
3.8
===
@@ -2171,4 +2172,3 @@ key in a given ColumnFamily) is limited by available memory, because
compaction deserializes each row before merging.
See https://issues.apache.org/jira/browse/CASSANDRA-16
-
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1393ec5/conf/logback-tools.xml
----------------------------------------------------------------------
diff --git a/conf/logback-tools.xml b/conf/logback-tools.xml
index e47985e..12b59fb 100644
--- a/conf/logback-tools.xml
+++ b/conf/logback-tools.xml
@@ -21,7 +21,7 @@
<appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
<target>System.err</target>
<encoder>
- <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern>
+ <pattern>%-5level %date{"HH:mm:ss,SSS"} %msg%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1393ec5/conf/logback.xml
----------------------------------------------------------------------
diff --git a/conf/logback.xml b/conf/logback.xml
index a47740d..b0c95f7 100644
--- a/conf/logback.xml
+++ b/conf/logback.xml
@@ -79,7 +79,7 @@ appender reference in the root level section below.
<level>INFO</level>
</filter>
<encoder>
- <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern>
+ <pattern>%-5level [%thread] %date{ISO8601} %F:%L - %msg%n</pattern>
</encoder>
</appender>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1393ec5/test/conf/logback-test.xml
----------------------------------------------------------------------
diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml
index f6a5492..94cff40 100644
--- a/test/conf/logback-test.xml
+++ b/test/conf/logback-test.xml
@@ -45,7 +45,7 @@
<appender name="STDOUT" target="System.out" class="org.apache.cassandra.ConsoleAppender">
<encoder>
- <pattern>%-5level %date{HH:mm:ss,SSS} %msg%n</pattern>
+ <pattern>%-5level [%thread] %date{ISO8601} %F:%L - %msg%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>DEBUG</level>