From 0623e1614b6694200d0f36124ffad040060918cb Mon Sep 17 00:00:00 2001
From: Ray Lee <ray.lee@lyrasis.org>
Date: Tue, 24 Sep 2019 12:00:52 -0700
Subject: [PATCH] DRYD-645: Configure log4j2 similarly to the old log4j config.

---
 .../src/main/resources/log4j2.xml             | 57 ++++++++++++-------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/services/JaxRsServiceProvider/src/main/resources/log4j2.xml b/services/JaxRsServiceProvider/src/main/resources/log4j2.xml
index 90ec075f4..b0a16b528 100644
--- a/services/JaxRsServiceProvider/src/main/resources/log4j2.xml
+++ b/services/JaxRsServiceProvider/src/main/resources/log4j2.xml
@@ -1,50 +1,65 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="WARN">
+	<Properties>
+		<Property name="logPattern">%d %-5p [%t] [%c:%L] %m%n</Property>
+	</Properties>
+
 	<Appenders>
 		<Console name="ConsoleAppender" target="SYSTEM_OUT">
-			<PatternLayout pattern="%d %-5p [%t] [%c:%L] %m%n" />
+			<ThresholdFilter level="WARN" />
+			<PatternLayout pattern="${logPattern}" />
 		</Console>
+
+		<RollingFile name="LogFileAppender" fileName="cspace-services.log" filePattern="cspace-services.%i.log">
+			<PatternLayout pattern="${logPattern}" />
+			<SizeBasedTriggeringPolicy size="5 MB"/>
+			<DefaultRolloverStrategy fileIndex="min" max="10"/>
+		</RollingFile>
 	</Appenders>
 
 	<Loggers>
-		<Root level="ERROR">
+		<Root level="DEBUG">
 			<AppenderRef ref="ConsoleAppender"/>
+			<AppenderRef ref="LogFileAppender" />
 		</Root>
 
-		<Logger name="org.collectionspace" level="DEBUG" additivity="false">
-			<AppenderRef ref="ConsoleAppender" />
-		</Logger>
+		<!-- CollectionSpace loggers -->
 
+		<Logger name="org.collectionspace" level="DEBUG" />
+		<Logger name="org.collectionspace.authentication.realm.db.CSpaceDbRealm" level="ERROR" />
 		<Logger name="org.collectionspace.services.authorization.spring.SpringPermissionManager" level="ERROR" />
-		<Logger name="org.collectionspace.services.listener.AbstractUpdateObjectLocationValues" level="INFO" />
+		<Logger name="org.collectionspace.services.client.AbstractServiceClientImpl" level="ERROR" />
+		<Logger name="org.collectionspace.services.common.authorization_mgt.AuthorizationCommon" level="ERROR" />
+		<Logger name="org.collectionspace.services.common.config.ServiceConfigUtils" level="ERROR" />
 		<Logger name="org.collectionspace.services.common.context.AbstractServiceContextImpl" level="ERROR" />
+		<Logger name="org.collectionspace.services.common.init" level="ERROR" />
+		<Logger name="org.collectionspace.services.common.security.SecurityInterceptor" level="ERROR" />
 		<Logger name="org.collectionspace.services.common.ServiceMain" level="INFO" />
-		<Logger name="org.collectionspace.authentication.realm.db.CSpaceDbRealm" level="ERROR" />
+		<Logger name="org.collectionspace.services.common.storage.JDBCTools" level="ERROR" />
+		<Logger name="org.collectionspace.services.listener.AbstractUpdateObjectLocationValues" level="INFO" />
 		<Logger name="org.collectionspace.services.nuxeo.client.java.CoreSessionWrapper" level="ERROR" />
 		<Logger name="org.collectionspace.services.nuxeo.client.java.NuxeoConnectorEmbedded" level="ERROR" />
-		<Logger name="org.collectionspace.services.common.authorization_mgt.AuthorizationCommon" level="ERROR" />
 		<Logger name="org.collectionspace.services.nuxeo.client.java.TenantRepository" level="ERROR" />
-		<Logger name="org.collectionspace.services.common.init" level="ERROR" />
-		<Logger name="org.collectionspace.services.common.config.ServiceConfigUtils" level="ERROR" />
 		<Logger name="org.collectionspace.services.report.nuxeo.ReportPostInitHandler" level="ERROR" />
-		<Logger name="org.collectionspace.services.client.AbstractServiceClientImpl" level="ERROR" />
-		<Logger name="org.collectionspace.services.common.security.SecurityInterceptor" level="ERROR" />
-		<Logger name="org.collectionspace.services.common.storage.JDBCTools" level="ERROR" />
+
+		<!-- Nuxeo loggers -->
 
 		<Logger name="org.nuxeo" level="WARN" />
 		<Logger name="org.nuxeo.elasticsearch" level="INFO" />
 
-		<Logger name="org.apache" level="WARN" />
+		<!-- Misc loggers -->
+
+		<Logger name="ch.elca.el4j.services.xmlmerge" level="WARN" />
+		<Logger name="com.mchange.v2.resourcepool.BasicResourcePool" level="ERROR" />
 		<Logger name="httpclient" level="WARN" />
-		<Logger name="org.jboss.resteasy" level="ERROR" />
+		<Logger name="net.sf.jmimemagic.MagicParser" level="WARN" />
+		<Logger name="org.apache" level="WARN" />
 		<Logger name="org.apache.catalina.core" level="WARN" />
-		<Logger name="org.springframework" level="ERROR" />
-		<Logger name="org.springframework.security" level="ERROR" />
-		<Logger name="org.jboss.security" level="ERROR" />
 		<Logger name="org.apache.catalina.realm" level="ERROR" />
 		<Logger name="org.hibernate" level="ERROR" />
-		<Logger name="ch.elca.el4j.services.xmlmerge" level="WARN" />
-		<Logger name="net.sf.jmimemagic.MagicParser" level="WARN" />
-		<Logger name="com.mchange.v2.resourcepool.BasicResourcePool" level="ERROR" />
+		<Logger name="org.jboss.resteasy" level="ERROR" />
+		<Logger name="org.jboss.security" level="ERROR" />
+		<Logger name="org.quartz" level="ERROR" />
+		<Logger name="org.springframework" level="ERROR" />
 	</Loggers>
 </Configuration>
-- 
2.47.3