lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject lucene-solr:master: SOLR-8445: fix line separator in log4j.properties files
Date Mon, 06 Jun 2016 21:23:11 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/master 00602a3a7 -> a9dea9a98


SOLR-8445: fix line separator in log4j.properties files


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a9dea9a9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a9dea9a9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a9dea9a9

Branch: refs/heads/master
Commit: a9dea9a983f899fba46132b6b35441706ad5798d
Parents: 00602a3
Author: Mikhail Khludnev <mkhl@apache.org>
Authored: Tue Jun 7 00:21:49 2016 +0300
Committer: Mikhail Khludnev <mkhl@apache.org>
Committed: Tue Jun 7 00:21:49 2016 +0300

----------------------------------------------------------------------
 solr/CHANGES.txt                                               | 2 ++
 solr/contrib/clustering/src/test-files/log4j.properties        | 2 +-
 solr/contrib/dataimporthandler/src/test-files/log4j.properties | 2 +-
 solr/example/resources/log4j.properties                        | 2 +-
 solr/server/resources/log4j.properties                         | 2 +-
 solr/server/scripts/cloud-scripts/log4j.properties             | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a9dea9a9/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0c8ebe9..56c111b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -360,6 +360,8 @@ Other Changes
 * SOLR-9081: Make SolrTestCaseJ4.beforeClass() / .afterClass() public so it
   works with Mockito (Georg Sorst, Alan Woodward)
 
+* SOLR-8445: fix line separator in log4j.properties files (Ahmet Arslan via Mikhail Khludnev)
+
 ==================  6.0.1 ==================
 (No Changes)
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a9dea9a9/solr/contrib/clustering/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/log4j.properties b/solr/contrib/clustering/src/test-files/log4j.properties
index 9b74a5f..b5216db 100644
--- a/solr/contrib/clustering/src/test-files/log4j.properties
+++ b/solr/contrib/clustering/src/test-files/log4j.properties
@@ -4,7 +4,7 @@ log4j.rootLogger=INFO, CONSOLE
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.Target=System.err
 log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
 
 log4j.logger.org.apache.zookeeper=WARN
 log4j.logger.org.apache.hadoop=WARN

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a9dea9a9/solr/contrib/dataimporthandler/src/test-files/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/log4j.properties b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
index fbc817f..d3ea4de 100644
--- a/solr/contrib/dataimporthandler/src/test-files/log4j.properties
+++ b/solr/contrib/dataimporthandler/src/test-files/log4j.properties
@@ -4,6 +4,6 @@ log4j.rootLogger=INFO, CONSOLE
 log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.Target=System.err
 log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
 
 log4j.logger.org.apache.zookeeper=WARN

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a9dea9a9/solr/example/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/example/resources/log4j.properties b/solr/example/resources/log4j.properties
index 92b21e5..02f91c5 100644
--- a/solr/example/resources/log4j.properties
+++ b/solr/example/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
 #- File to log to and log format
 log4j.appender.file.File=${solr.log}/solr.log
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection}
%X{shard} %X{replica} %X{core}] %C; %m\n
+log4j.appender.file.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; [%X{collection}
%X{shard} %X{replica} %X{core}] %C; %m%n
 
 log4j.logger.org.apache.zookeeper=WARN
 log4j.logger.org.apache.hadoop=WARN

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a9dea9a9/solr/server/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/resources/log4j.properties b/solr/server/resources/log4j.properties
index 2465eae..d5ebcd1 100644
--- a/solr/server/resources/log4j.properties
+++ b/solr/server/resources/log4j.properties
@@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
 #- File to log to and log format
 log4j.appender.file.File=${solr.log}/solr.log
 log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection}
%X{shard} %X{replica} %X{core}] %c{1.} %m\n
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection}
%X{shard} %X{replica} %X{core}] %c{1.} %m%n
 
 log4j.logger.org.apache.zookeeper=WARN
 log4j.logger.org.apache.hadoop=WARN

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a9dea9a9/solr/server/scripts/cloud-scripts/log4j.properties
----------------------------------------------------------------------
diff --git a/solr/server/scripts/cloud-scripts/log4j.properties b/solr/server/scripts/cloud-scripts/log4j.properties
index c54b790..5f2ae18 100644
--- a/solr/server/scripts/cloud-scripts/log4j.properties
+++ b/solr/server/scripts/cloud-scripts/log4j.properties
@@ -5,7 +5,7 @@ log4j.rootLogger=INFO, 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{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m\n
+log4j.appender.stderr.layout.ConversionPattern=%-5p - %d{yyyy-MM-dd HH:mm:ss.SSS}; %C; %m%n
 
 # quiet down the ZK logging for cli tools
 log4j.logger.org.apache.zookeeper=WARN


Mime
View raw message