Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mikhail Khludnev 2016-06-07 00:21:49 +03:00
parent 4e3884bec7
commit 871347282a
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -329,6 +329,8 @@ Other Changes
* SOLR-9081: Make SolrTestCaseJ4.beforeClass() / .afterClass() public so it * SOLR-9081: Make SolrTestCaseJ4.beforeClass() / .afterClass() public so it
works with Mockito (Georg Sorst, Alan Woodward) works with Mockito (Georg Sorst, Alan Woodward)
* SOLR-8445: fix line separator in log4j.properties files (Ahmet Arslan via Mikhail Khludnev)
================== 6.0.1 ================== ================== 6.0.1 ==================
(No Changes) (No Changes)

2
solr/contrib/clustering/src/test-files/log4j.properties
View File

@ -4,7 +4,7 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout 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.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN log4j.logger.org.apache.hadoop=WARN

2
solr/contrib/dataimporthandler/src/test-files/log4j.properties
View File

@ -4,6 +4,6 @@ log4j.rootLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.Target=System.err log4j.appender.CONSOLE.Target=System.err
log4j.appender.CONSOLE.layout=org.apache.solr.util.SolrLogLayout 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.zookeeper=WARN

2
solr/example/resources/log4j.properties
View File

@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format #- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout 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.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN log4j.logger.org.apache.hadoop=WARN

2
solr/server/resources/log4j.properties
View File

@ -15,7 +15,7 @@ log4j.appender.file.MaxBackupIndex=9
#- File to log to and log format #- File to log to and log format
log4j.appender.file.File=${solr.log}/solr.log log4j.appender.file.File=${solr.log}/solr.log
log4j.appender.file.layout=org.apache.log4j.EnhancedPatternLayout 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.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN log4j.logger.org.apache.hadoop=WARN

2
solr/server/scripts/cloud-scripts/log4j.properties
View File

@ -5,7 +5,7 @@ log4j.rootLogger=INFO, stderr
log4j.appender.stderr = org.apache.log4j.ConsoleAppender log4j.appender.stderr = org.apache.log4j.ConsoleAppender
log4j.appender.stderr.Target = System.err log4j.appender.stderr.Target = System.err
log4j.appender.stderr.layout = org.apache.log4j.PatternLayout 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 # quiet down the ZK logging for cli tools
log4j.logger.org.apache.zookeeper=WARN log4j.logger.org.apache.zookeeper=WARN