aboutsummaryrefslogtreecommitdiff
path: root/basicConfig
diff options
context:
space:
mode:
Diffstat (limited to 'basicConfig')
-rw-r--r--basicConfig/logback_config.xml70
-rw-r--r--basicConfig/templates/error_message.html18
2 files changed, 44 insertions, 44 deletions
diff --git a/basicConfig/logback_config.xml b/basicConfig/logback_config.xml
index 0a53b1ec..ddb9f864 100644
--- a/basicConfig/logback_config.xml
+++ b/basicConfig/logback_config.xml
@@ -8,20 +8,20 @@
<!-- http://www.qos.ch/shop/products/professionalSupport -->
<!-- -->
<configuration>
- <appender name="EIDASNODE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <appender name="MSEIDAS" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
- <File>${catalina.base}/logs/eIDAS_node.log</File>
+ <File>${catalina.base}/logs/ms_specific_node.log.log</File>
<encoder>
- <pattern>%5p | %d{dd HH:mm:ss,SSS} | %t | %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/eIDAS_node.log.%i</FileNamePattern>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${catalina.base}/logs/ms_specific_node.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">
<!--See also http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
<File>${catalina.base}/logs/eidas-ms-reversion.log</File>
@@ -36,20 +36,7 @@
<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/eidas-ms-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>
- </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/eidas-ms-statistic.log</File>
@@ -64,39 +51,54 @@
<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.FixedWindowRollingPolicy">
- <maxIndex>9999</maxIndex>
- <FileNamePattern>${catalina.base}/logs/console.log.%i</FileNamePattern>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${catalina.base}/logs/eidas-ms-statistic.log.%d{yyyy-MM-dd}</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>
</encoder>
</appender>
- <logger name="eu.eidas" additivity="false" level="info">
- <appender-ref ref="EIDASNODE"/>
+
+ <logger name="at.asitplus.eidas.specific.connector.logger.StatisticLogger" additivity="false" level="info">
+ <appender-ref ref="statistic"/>
</logger>
<logger name="at.gv.egiz.eidas.specific" additivity="false" level="info">
- <appender-ref ref="msnode"/>
- </logger>
- <logger name="at.gv.egiz.eidas.specific.connector.logger.RevisionLogger" additivity="false" level="info">
<appender-ref ref="reversion"/>
</logger>
- <logger name="at.gv.egiz.eidas.specific.connector.logger.StatisticLogger" additivity="false" level="info">
+ <logger name="at.gv.egiz.eidas.specific.connector.logger.StatisticLogger" level="info">
<appender-ref ref="statistic"/>
</logger>
- <root level="warn">
- <appender-ref ref="stdout"/>
+ <logger name="at.gv.egiz.eidas.specific.connector.logger.RevisionLogger" 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">
<appender-ref ref="console"/>
</root>
</configuration>
diff --git a/basicConfig/templates/error_message.html b/basicConfig/templates/error_message.html
index d8c3de56..6e170107 100644
--- a/basicConfig/templates/error_message.html
+++ b/basicConfig/templates/error_message.html
@@ -12,7 +12,7 @@
</head>
<body>
-<div class="header container">
+ <div class="header container">
<div class="titlebar">
<div>
<a href="https://www.bmi.gv.at/" target="_blank" title="Home">
@@ -28,14 +28,15 @@
</li>
</ul>
</div>
-</div>
-<div class="content">
+ </div>
+ <div class="content">
<div class="subtitle">
<h1 th:text="#{gui.countryselection.header2}"> Zentraler eIDAS Knoten der Republik Österreich </h1>
<h2 th:text="#{gui.countryselection.header3}"> Betrieben durch das Bundesministerium für Inneres </h2>
</div>
<div id="page1" class="case selected-case" role="main">
<div class="hell" role="application" >
+
<h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
<div id="alert_area" class="hell" role="application" >
@@ -45,14 +46,11 @@
<p><b th:text="#{gui.errorpage.msg.errormsg}">Msg :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
</div>
</div>
-
- </div>
-
-
-</div>
-<footer>
+ </div>
+ </div>
+ <footer>
<div class="copyright">&copy; BUNDESMINISTERIUM FÜR INNERES</div>
<div></div>
-</footer>
+ </footer>
</body>
</html>