From 4041e480a1fedef4edade3f2f914d045c6bbb881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org>
Date: Thu, 12 Sep 2024 12:24:07 +0200
Subject: [PATCH] Revert stdout settings

---
 .../src/main/resources/log4j2.xml             | 130 +++++++++++++-----
 pom.xml                                       |   4 +-
 2 files changed, 99 insertions(+), 35 deletions(-)

diff --git a/fit/core-reference/src/main/resources/log4j2.xml b/fit/core-reference/src/main/resources/log4j2.xml
index 7bf54970d0..3694e4dddf 100644
--- a/fit/core-reference/src/main/resources/log4j2.xml
+++ b/fit/core-reference/src/main/resources/log4j2.xml
@@ -20,107 +20,171 @@ under the License.
 <configuration status="WARN">
 
   <appenders>
+    <RollingRandomAccessFile name="main" fileName="${sys:syncope.log.dir}/core.log"
+                             filePattern="${sys:syncope.log.dir}/core-%d{yyyy-MM-dd}.log.gz"
+                             immediateFlush="false" append="true">
+      <PatternLayout>
+        <pattern>%d{HH:mm:ss.SSS} %notEmpty{[operation.id=%X{operation.id}] }%-5level %logger - %msg%n</pattern>
+      </PatternLayout>
+      <Policies>
+        <TimeBasedTriggeringPolicy/>
+        <SizeBasedTriggeringPolicy size="250 MB"/>
+      </Policies>
+    </RollingRandomAccessFile>
 
-    <Console name="console" target="SYSTEM_OUT" follow="true">
-      <PatternLayout pattern="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} %notEmpty{[operation.id=%X{operation.id}] }%highlight{${LOG_LEVEL_PATTERN:-%5p}}{FATAL=red blink, ERROR=red, WARN=yellow bold, INFO=green, DEBUG=green bold, TRACE=blue} [%11.11t] %style{%-60.60c{60}}{cyan} : %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
-    </Console>
+    <RollingRandomAccessFile name="persistence" fileName="${sys:syncope.log.dir}/core-persistence.log"
+                             filePattern="${sys:syncope.log.dir}/core-persistence-%d{yyyy-MM-dd}.log.gz"
+                             immediateFlush="false" append="true">
+      <PatternLayout>
+        <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+      </PatternLayout>
+      <Policies>
+        <TimeBasedTriggeringPolicy/>
+        <SizeBasedTriggeringPolicy size="250 MB"/>
+      </Policies>
+    </RollingRandomAccessFile>
+
+    <RollingRandomAccessFile name="rest" fileName="${sys:syncope.log.dir}/core-rest.log"
+                             filePattern="${sys:syncope.log.dir}/core-rest-%d{yyyy-MM-dd}.log.gz"
+                             immediateFlush="false" append="true">
+      <PatternLayout>
+        <pattern>%d{HH:mm:ss.SSS} %-5level %logger - %msg%n</pattern>
+      </PatternLayout>
+      <Policies>
+        <TimeBasedTriggeringPolicy/>
+        <SizeBasedTriggeringPolicy size="250 MB"/>
+      </Policies>
+    </RollingRandomAccessFile>
+
+    <RollingRandomAccessFile name="connid" fileName="${sys:syncope.log.dir}/core-connid.log"
+                             filePattern="${sys:syncope.log.dir}/core-connid-%d{yyyy-MM-dd}.log.gz"
+                             immediateFlush="false" append="true">
+      <PatternLayout>
+        <pattern>%d{HH:mm:ss.SSS} %-5level %msg%n</pattern>
+      </PatternLayout>
+      <Policies>
+        <TimeBasedTriggeringPolicy/>
+        <SizeBasedTriggeringPolicy size="250 MB"/>
+      </Policies>
+    </RollingRandomAccessFile>
 
   </appenders>
   
   <loggers>
     
     <asyncLogger name="org.apache.syncope.core.persistence" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="persistence"/>
+    </asyncLogger>
+    <asyncLogger name="org.springframework.data" additivity="false" level="INFO">
+      <appender-ref ref="persistence"/>
     </asyncLogger>
     <asyncLogger name="org.springframework.orm" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="persistence"/>
     </asyncLogger>
     <asyncLogger name="org.apache.openjpa" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="persistence"/>
     </asyncLogger>
     <asyncLogger name="org.apache.ibatis" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="persistence"/>
     </asyncLogger>
-    
+    <asyncLogger name="org.springframework.data.neo4j.cypher.unrecognized" additivity="false" level="ERROR">
+      <appender-ref ref="persistence"/>
+    </asyncLogger>
+    <asyncLogger name="org.springframework.data.neo4j.core.mapping" additivity="false" level="ERROR">
+      <appender-ref ref="persistence"/>
+    </asyncLogger>
+
     <asyncLogger name="org.apache.syncope.core.rest" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="rest"/>
     </asyncLogger>
     <asyncLogger name="org.springframework.web" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="rest"/>
     </asyncLogger>
     <asyncLogger name="org.apache.http" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="rest"/>
     </asyncLogger>
     <asyncLogger name="org.apache.cxf" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="rest"/>
+    </asyncLogger>
+    <asyncLogger name="org.apache.syncope.ext.self.keymaster" additivity="false" level="ERROR">
+      <appender-ref ref="rest"/>
     </asyncLogger>
     
     <asyncLogger name="org.identityconnectors" additivity="false" level="DEBUG">
-      <appender-ref ref="console"/>
+      <appender-ref ref="connid"/>
     </asyncLogger>
     <asyncLogger name="net.tirasa.connid" additivity="false" level="DEBUG">
-      <appender-ref ref="console"/>
+      <appender-ref ref="connid"/>
     </asyncLogger>
     <asyncLogger name="org.apache.syncope.core.provisioning.api.ConnIdBundleManager" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="connid"/>
     </asyncLogger>
     
     <asyncLogger name="org.apache.syncope" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.apache.syncope.core.provisioning" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.apache.syncope.core.logic" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.springframework" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.flowable" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="liquibase" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.apache.fop" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.apache.wss4j" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.apache.xml" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.opensaml" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="io.swagger" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.reflections" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="org.elasticsearch" additivity="false" level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
+    </asyncLogger>
+    <asyncLogger name="org.opensearch" additivity="false" level="INFO">
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="io.netty" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="com.zaxxer.hikari" additivity="false" level="ERROR">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
+    </asyncLogger>
+    <asyncLogger name="org.apache.zookeeper" additivity="false" level="ERROR">
+      <appender-ref ref="main"/>
+    </asyncLogger>
+    <asyncLogger name="org.apache.curator" additivity="false" level="ERROR">
+      <appender-ref ref="main"/>
     </asyncLogger>
     
     <!-- To enable when setting 'mail.debug=true' in mail.properties -->
     <!--<asyncLogger name="org.apache.syncope.core.provisioning.java.job.notification" additivity="false" level="DEBUG">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>
     <asyncLogger name="javax.mail" additivity="false" level="DEBUG">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </asyncLogger>-->
     
     <root level="INFO">
-      <appender-ref ref="console"/>
+      <appender-ref ref="main"/>
     </root>
     
   </loggers>
diff --git a/pom.xml b/pom.xml
index 423a6951a4..ef8ba14924 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1610,8 +1610,8 @@ under the License.
           <version>1.10.14</version>
           <configuration>
             <container>
-              <!--<log>${project.build.directory}/log/cargo.log</log>
-              <output>${project.build.directory}/log/cargo-output.log</output>-->
+              <log>${project.build.directory}/log/cargo.log</log>
+              <output>${project.build.directory}/log/cargo-output.log</output>
               <systemProperties>
                 <syncope.conf.dir>${project.build.directory}/test-classes</syncope.conf.dir>
                 <syncope.connid.location>file:${bundles.directory}/</syncope.connid.location>