From 2cdeacd40b2a1b73e1139859a179bab34606961e Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 11 Dec 2023 12:21:04 +0100
Subject: doc(log): merge default logback configuration with latest BM.I
 version

---
 basicConfig/ms-connector/logback_config.xml    | 114 +++++++++++++++----------
 basicConfig/ms-proxyservice/logback_config.xml | 112 +++++++++++++-----------
 2 files changed, 130 insertions(+), 96 deletions(-)

diff --git a/basicConfig/ms-connector/logback_config.xml b/basicConfig/ms-connector/logback_config.xml
index e99c2a5f..95bd40de 100644
--- a/basicConfig/ms-connector/logback_config.xml
+++ b/basicConfig/ms-connector/logback_config.xml
@@ -12,90 +12,112 @@
   
   <appender name="MSEIDAS" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}.log</File>
+    <!-- <File>${catalina.base}/logs/ms_specific_node.log</File> -->
     <encoder>
+      <!-- <pattern>%5p | %d{ISO8601} | %X{transactionId} | %contextName - %class - %logger  - %file | %logger | %m%n</pattern> -->
       <pattern>%5p | %d{ISO8601} | %X{transactionId} | %t | %logger{16} | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${catalina.base}/logs/ms_${appId:-core}.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <fileNamePattern>${catalina.base}/logs/eidas-${appId:-common}.%d{yyyy-MM-dd}.log</fileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-  
   <appender name="reversion" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}-reversion.log</File>
+    <!-- <File>${catalina.base}/logs/eidas-ms-reversion.log</File> -->
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
+      <!-- <pattern>%5p | %d{ISO8601} | %contextName - %class - %logger  - %file | %m%n</pattern> -->
+      <pattern>%5p | %d{ISO8601} | %X{transactionId} | %t | %logger{16} | %m%n</pattern>
     </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-reversion.log.%i</FileNamePattern>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${catalina.base}/logs/eidas-${appId:-common}-reversion.%d{yyyy-MM-dd}.log</fileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-
   <appender name="statistic" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.log</File>
+    <!-- <File>${catalina.base}/logs/eidas-ms-statistic.log</File> -->
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
+      <!-- <pattern>%5p | %d{ISO8601} | %contextName - %class - %logger - %file | %m%n</pattern> -->
+      <pattern>%5p | %d{ISO8601} | %t | %m%n</pattern>
     </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.log.%i</FileNamePattern>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <!-- fileNamePattern>${catalina.base}/logs/eidas-ms-statistic.%d{yyyy-MM-dd}.log</fileNamePattern-->
+      <fileNamePattern>${catalina.base}/logs/eidas-${appId:-common}-statistic.%d{yyyy-MM-dd}.log</fileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-
-  <appender name="statisticJson" class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="statisticJson-connector" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.json</File>
+    <!-- 
+    <File>${catalina.base}/logs/eidas-connector-statistic-json.log</File> -->
     <encoder>
       <pattern>%m%n</pattern>
     </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.json.%i</FileNamePattern>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <FileNamePattern>${catalina.base}/logs/eidas-connector-statistic-json.%d{yyyy-MM-dd}.log</FileNamePattern>
+    </rollingPolicy>
+  </appender>
+  <appender name="statisticJson-proxy" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+    <!--<File>${catalina.base}/logs/eidas-proxy-statistic-json.log</File> -->
+    <encoder>
+      <pattern>%m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <FileNamePattern>${catalina.base}/logs/eidas-proxy-statistic-json.%d{yyyy-MM-dd}.log</FileNamePattern>
+    </rollingPolicy>
+  </appender>
+  <appender name="ignite" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${catalina.base}/logs/ignite-${appId:-common}.log</file>
+    <encoder>
+      <pattern>%5p | %date{ISO8601} | %t | %m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <maxHistory>14</maxHistory>
+      <FileNamePattern>${catalina.base}/logs/ignite-${appId:-common}.%d{yyyy-MM-dd}.log.gz</FileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-  
   <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %20c | %10t | %m%n</pattern>
+      <pattern>%5p | %d{ISO8601} | %20c | %10t | %m%n</pattern>
     </encoder>
   </appender>
-  
-  <logger name="at.asitplus.eidas.specific.core.logger.StatisticLogger" additivity="false" level="info">
+  <logger name="at.asitplus.eidas.specific.connector.logger.StatisticLogger" additivity="false" level="info">
     <appender-ref ref="statistic"/>
   </logger>
   <logger name="at.asitplus.eidas.specific.core.logger.AdvancedStatisticLogger" additivity="false" level="info">
-    <appender-ref ref="statisticJson"/>
-  </logger>    
-  <logger name="at.asitplus.eidas.specific.core.logger.RevisionLogger" level="info">
+    <appender-ref ref="statisticJson-connector"/>
+  </logger>
+  <logger name="at.asitplus.eidas.specific.proxy.logger.AdvancedStatisticLogger" additivity="false" level="info">
+    <appender-ref ref="statisticJson-proxy"/>
+  </logger>
+  <logger name="at.gv.egiz.eidas.specific" additivity="false" level="info">
     <appender-ref ref="reversion"/>
   </logger>
-
-  <logger name="at.gv.egiz.eventlog.csv.all" additivity="false" level="off" />
-  <logger name="at.gv.egiz.eventlog.plain.all" additivity="false" level="off" />
-  
+  <logger name="at.asitplus.eidas.specific.core.logger.StatisticLogger" additivity="false" level="info">
+    <appender-ref ref="statistic"/>
+  </logger>
+  <logger name="at.asitplus.eidas.specific.core.logger.RevisionLogger" additivity="false" level="info">
+    <appender-ref ref="reversion"/>
+  </logger>
+  <logger name="at.gv.egiz.eventlog.simple.all" additivity="false" level="info">
+    <appender-ref ref="MSEIDAS"/>
+  </logger>
+  <logger name="at.gv.egiz.eventlog.csv.all" additivity="false" level="off"/>
+  <logger name="at.gv.egiz.eventlog.plain.all" additivity="false" level="info">
+    <appender-ref ref="reversion"/>
+  </logger>
+  <logger name="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.CreateIdentityLinkTask" level="debug">
+    <appender-ref ref="MSEIDAS"/>
+  </logger>
   <logger name="at.asitplus.eidas.specific" additivity="false" level="info">
     <appender-ref ref="MSEIDAS"/>
   </logger>
   <logger name="at.gv.egiz.eaaf" additivity="false" level="info">
     <appender-ref ref="MSEIDAS"/>
-  </logger>  
-  
-  <root level="info">
+  </logger>
+  <logger name="org.apache.ignite" additivity="false" level="info">
+    <appender-ref ref="ignite"/>
+  </logger>
+  <root level="warn">
     <appender-ref ref="console"/>
   </root>
 </configuration>
diff --git a/basicConfig/ms-proxyservice/logback_config.xml b/basicConfig/ms-proxyservice/logback_config.xml
index 30e2f9f1..95bd40de 100644
--- a/basicConfig/ms-proxyservice/logback_config.xml
+++ b/basicConfig/ms-proxyservice/logback_config.xml
@@ -12,100 +12,112 @@
   
   <appender name="MSEIDAS" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}.log.log</File>
+    <!-- <File>${catalina.base}/logs/ms_specific_node.log</File> -->
     <encoder>
+      <!-- <pattern>%5p | %d{ISO8601} | %X{transactionId} | %contextName - %class - %logger  - %file | %logger | %m%n</pattern> -->
       <pattern>%5p | %d{ISO8601} | %X{transactionId} | %t | %logger{16} | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${catalina.base}/logs/ms_${appId:-core}.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <fileNamePattern>${catalina.base}/logs/eidas-${appId:-common}.%d{yyyy-MM-dd}.log</fileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-  
   <appender name="reversion" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}-reversion.log</File>
+    <!-- <File>${catalina.base}/logs/eidas-ms-reversion.log</File> -->
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
+      <!-- <pattern>%5p | %d{ISO8601} | %contextName - %class - %logger  - %file | %m%n</pattern> -->
+      <pattern>%5p | %d{ISO8601} | %X{transactionId} | %t | %logger{16} | %m%n</pattern>
     </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-reversion.log.%i</FileNamePattern>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${catalina.base}/logs/eidas-${appId:-common}-reversion.%d{yyyy-MM-dd}.log</fileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-
   <appender name="statistic" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.log</File>
+    <!-- <File>${catalina.base}/logs/eidas-ms-statistic.log</File> -->
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
+      <!-- <pattern>%5p | %d{ISO8601} | %contextName - %class - %logger - %file | %m%n</pattern> -->
+      <pattern>%5p | %d{ISO8601} | %t | %m%n</pattern>
     </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.log.%i</FileNamePattern>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <!-- fileNamePattern>${catalina.base}/logs/eidas-ms-statistic.%d{yyyy-MM-dd}.log</fileNamePattern-->
+      <fileNamePattern>${catalina.base}/logs/eidas-${appId:-common}-statistic.%d{yyyy-MM-dd}.log</fileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-
-  <appender name="statisticJson" class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="statisticJson-connector" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.json</File>
+    <!-- 
+    <File>${catalina.base}/logs/eidas-connector-statistic-json.log</File> -->
     <encoder>
       <pattern>%m%n</pattern>
     </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.json.%i</FileNamePattern>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <FileNamePattern>${catalina.base}/logs/eidas-connector-statistic-json.%d{yyyy-MM-dd}.log</FileNamePattern>
     </rollingPolicy>
-    <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-      <MaxFileSize>10000KB</MaxFileSize>
-    </triggeringPolicy>
   </appender>
-
-  <appender name="stdout" class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="statisticJson-proxy" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/console.log</File>
+    <!--<File>${catalina.base}/logs/eidas-proxy-statistic-json.log</File> -->
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
+      <pattern>%m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${catalina.base}/logs/console.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/eidas-proxy-statistic-json.%d{yyyy-MM-dd}.log</FileNamePattern>
+    </rollingPolicy>
+  </appender>
+  <appender name="ignite" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${catalina.base}/logs/ignite-${appId:-common}.log</file>
+    <encoder>
+      <pattern>%5p | %date{ISO8601} | %t | %m%n</pattern>
+    </encoder>
+    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <maxHistory>14</maxHistory>
+      <FileNamePattern>${catalina.base}/logs/ignite-${appId:-common}.%d{yyyy-MM-dd}.log.gz</FileNamePattern>
     </rollingPolicy>
   </appender>
-  
   <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %20c | %10t | %m%n</pattern>
+      <pattern>%5p | %d{ISO8601} | %20c | %10t | %m%n</pattern>
     </encoder>
   </appender>
-  
-  <logger name="at.asitplus.eidas.specific.core.logger.StatisticLogger" additivity="false" level="info">
+  <logger name="at.asitplus.eidas.specific.connector.logger.StatisticLogger" additivity="false" level="info">
     <appender-ref ref="statistic"/>
   </logger>
+  <logger name="at.asitplus.eidas.specific.core.logger.AdvancedStatisticLogger" additivity="false" level="info">
+    <appender-ref ref="statisticJson-connector"/>
+  </logger>
   <logger name="at.asitplus.eidas.specific.proxy.logger.AdvancedStatisticLogger" additivity="false" level="info">
-    <appender-ref ref="statisticJson"/>
-  </logger>   
-  <logger name="at.asitplus.eidas.specific.core.logger.RevisionLogger" level="info">
+    <appender-ref ref="statisticJson-proxy"/>
+  </logger>
+  <logger name="at.gv.egiz.eidas.specific" additivity="false" level="info">
     <appender-ref ref="reversion"/>
   </logger>
-  <logger name="at.gv.egiz.eventlog.csv.all" additivity="false" level="off" />
-  <logger name="at.gv.egiz.eventlog.plain.all" additivity="false" level="off" />
-  
+  <logger name="at.asitplus.eidas.specific.core.logger.StatisticLogger" additivity="false" level="info">
+    <appender-ref ref="statistic"/>
+  </logger>
+  <logger name="at.asitplus.eidas.specific.core.logger.RevisionLogger" additivity="false" level="info">
+    <appender-ref ref="reversion"/>
+  </logger>
+  <logger name="at.gv.egiz.eventlog.simple.all" additivity="false" level="info">
+    <appender-ref ref="MSEIDAS"/>
+  </logger>
+  <logger name="at.gv.egiz.eventlog.csv.all" additivity="false" level="off"/>
+  <logger name="at.gv.egiz.eventlog.plain.all" additivity="false" level="info">
+    <appender-ref ref="reversion"/>
+  </logger>
+  <logger name="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.CreateIdentityLinkTask" level="debug">
+    <appender-ref ref="MSEIDAS"/>
+  </logger>
   <logger name="at.asitplus.eidas.specific" additivity="false" level="info">
     <appender-ref ref="MSEIDAS"/>
   </logger>
   <logger name="at.gv.egiz.eaaf" additivity="false" level="info">
     <appender-ref ref="MSEIDAS"/>
-  </logger>  
-  
-  <root level="info">
+  </logger>
+  <logger name="org.apache.ignite" additivity="false" level="info">
+    <appender-ref ref="ignite"/>
+  </logger>
+  <root level="warn">
     <appender-ref ref="console"/>
   </root>
 </configuration>
-- 
cgit v1.2.3