SEARCH-247: No longer loading multiple log4j.properties

This commit is contained in:
Gethin James
2016-11-28 10:11:46 +01:00
parent 767800a521
commit 729b367e3e
3 changed files with 36 additions and 25 deletions
@@ -81,8 +81,6 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
public AlfrescoCoreAdminHandler(CoreContainer coreContainer)
{
super(coreContainer);
initResourceBasedLogging("log4j.properties");
initResourceBasedLogging("log4j-solr.properties");
startup(coreContainer);
}
@@ -1,23 +0,0 @@
# Set root logger level to error
log4j.rootLogger=ERROR, Console, File
###### Console appender definition #######
# All outputs currently set to be a ConsoleAppender.
log4j.appender.Console=org.apache.log4j.ConsoleAppender
log4j.appender.Console.layout=org.apache.log4j.PatternLayout
log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n
###### File appender definition #######
log4j.appender.File=org.apache.log4j.DailyRollingFileAppender
log4j.appender.File.File=solr.log
log4j.appender.File.Append=true
log4j.appender.File.DatePattern='.'yyyy-MM-dd
log4j.appender.File.layout=org.apache.log4j.PatternLayout
log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] %m%n
log4j.logger.org.alfresco.solr.tracker.AclTracker=ERROR
log4j.logger.org.alfresco.solr.component.AsyncBuildSuggestComponent=INFO
@@ -0,0 +1,36 @@
# Alfresco Solr log4j config
# rootLogger log level may be programmatically overridden by -Dsolr.log.level
solr.log=${solr.log.dir}
log4j.rootLogger=WARN, file, CONSOLE
# Console appender will be programmatically disabled when Solr is started with option -Dsolr.log.muteconsole
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.EnhancedPatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss.SSS} %-5p (%t) [%X{collection} %X{shard} %X{replica} %X{core}] %c{1.} %m%n
#- size rotation with log cleanup.
log4j.appender.file=org.apache.log4j.RollingFileAppender
log4j.appender.file.MaxFileSize=4MB
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
# Adjust logging levels that should differ from root logger
log4j.logger.org.apache.zookeeper=WARN
log4j.logger.org.apache.hadoop=WARN
log4j.logger.org.eclipse.jetty=WARN
log4j.logger.org.eclipse.jetty.server.Server=INFO
log4j.logger.org.eclipse.jetty.server.ServerConnector=INFO
# set to INFO to enable infostream log messages
log4j.logger.org.apache.solr.update.LoggingInfoStream=OFF
log4j.logger.org.apache.solr.schema.FieldTypePluginLoader=ERROR
log4j.logger.org.apache.commons.httpclient=WARN
log4j.logger.org.apache.solr.servlet.SolrDispatchFilter=INFO
log4j.logger.org.alfresco.solr=WARN
#log4j.logger.org.alfresco.solr.tracker.AclTracker=ERROR
#log4j.logger.org.alfresco.solr.component.AsyncBuildSuggestComponent=INFO