From 275df4bcfba3d078b77776ac9767b3e30de8e59a Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Thu, 7 Dec 2023 17:11:48 +0100
Subject: doc(core): update default logger configuration to add
 application-context specific logging

---
 basicConfig/ms-connector/logback_config.xml    | 35 +++++++++-----------------
 basicConfig/ms-proxyservice/logback_config.xml | 23 ++++++++---------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/basicConfig/ms-connector/logback_config.xml b/basicConfig/ms-connector/logback_config.xml
index 2a3d0885..e99c2a5f 100644
--- a/basicConfig/ms-connector/logback_config.xml
+++ b/basicConfig/ms-connector/logback_config.xml
@@ -8,29 +8,31 @@
 <!--    http://www.qos.ch/shop/products/professionalSupport         -->
 <!--                                                                -->
 <configuration>
+  <contextListener class="at.asitplus.eidas.specific.config.LoggerContextConfiguration"/>
+  
   <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_specific_node.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}.log</File>
     <encoder>
       <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_specific_node.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <fileNamePattern>${catalina.base}/logs/ms_${appId:-core}.log.%d{yyyy-MM-dd}</fileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
     </triggeringPolicy>
   </appender>
   
-  <appender name="msnode" class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="reversion" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/eidas-ms-reversion.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}-reversion.log</File>
     <encoder>
       <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/eidas-ms-reversion.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-reversion.log.%i</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -39,13 +41,13 @@
 
   <appender name="statistic" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/eidas-ms-statistic.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.log</File>
     <encoder>
       <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/eidas-ms-statistic.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.log.%i</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -54,29 +56,18 @@
 
   <appender name="statisticJson" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/eidas-ms-statistic-json.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.json</File>
     <encoder>
       <pattern>%m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/eidas-ms-statistic-json.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.json.%i</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">
-    <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/console.log</File>
-    <encoder>
-      <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>${catalina.base}/logs/console.log.%d{yyyy-MM-dd}</fileNamePattern>
-    </rollingPolicy>
-  </appender>
   
   <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
@@ -93,9 +84,7 @@
   <logger name="at.asitplus.eidas.specific.core.logger.RevisionLogger" level="info">
     <appender-ref ref="reversion"/>
   </logger>
-  <logger name="at.gv.egiz.eventlog.simple.all" 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" />
   
diff --git a/basicConfig/ms-proxyservice/logback_config.xml b/basicConfig/ms-proxyservice/logback_config.xml
index 46f68888..30e2f9f1 100644
--- a/basicConfig/ms-proxyservice/logback_config.xml
+++ b/basicConfig/ms-proxyservice/logback_config.xml
@@ -8,29 +8,31 @@
 <!--    http://www.qos.ch/shop/products/professionalSupport         -->
 <!--                                                                -->
 <configuration>
+  <contextListener class="at.asitplus.eidas.specific.config.LoggerContextConfiguration"/>
+  
   <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_specific_proxyservice.log.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}.log.log</File>
     <encoder>
       <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_specific_proxyservice.log.%d{yyyy-MM-dd}</fileNamePattern>
+      <fileNamePattern>${catalina.base}/logs/ms_${appId:-core}.log.%d{yyyy-MM-dd}</fileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
     </triggeringPolicy>
   </appender>
   
-  <appender name="msnode" class="ch.qos.logback.core.rolling.RollingFileAppender">
+  <appender name="reversion" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/eidas-ms-reversion_proxyservice.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}-reversion.log</File>
     <encoder>
       <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/eidas-ms-reversion_proxyservice.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-reversion.log.%i</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -39,13 +41,13 @@
 
   <appender name="statistic" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/eidas-ms-statistic_proxyservice.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.log</File>
     <encoder>
       <pattern>%5p | %d{dd HH:mm:ss,SSS} | %X{transactionId} | %t | %m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/eidas-ms-statistic_proxyservice.log.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.log.%i</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -54,13 +56,13 @@
 
   <appender name="statisticJson" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
-    <File>${catalina.base}/logs/eidas-ms-statistic_proxyservice.log</File>
+    <File>${catalina.base}/logs/ms_${appId:-core}-statistic.json</File>
     <encoder>
       <pattern>%m%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <maxIndex>9999</maxIndex>
-      <FileNamePattern>${catalina.base}/logs/eidas-ms-statistic_proxyservice.%i</FileNamePattern>
+      <FileNamePattern>${catalina.base}/logs/ms_${appId:-core}-statistic.json.%i</FileNamePattern>
     </rollingPolicy>
     <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
       <MaxFileSize>10000KB</MaxFileSize>
@@ -93,9 +95,6 @@
   <logger name="at.asitplus.eidas.specific.core.logger.RevisionLogger" level="info">
     <appender-ref ref="reversion"/>
   </logger>
-  <logger name="at.gv.egiz.eventlog.simple.all" 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" />
   
-- 
cgit v1.2.3