Skip to content

Commit edec147

Browse files
baszoetekouwbaszoetekouw
committed
xml formatting
1 parent fcd9ebf commit edec147

3 files changed

Lines changed: 111 additions & 111 deletions

File tree

‎roles/invite/templates/logback.xml.j2‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,41 @@
22
<?xml version="1.0" encoding="UTF-8"?>
33
<configuration scan="true">
44

5-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
6-
<encoder>
7-
<pattern>%d{ISO8601} %5p [%t] %logger{40}:%L - %m%n</pattern>
8-
</encoder>
9-
</appender>
5+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
6+
<encoder>
7+
<pattern>%d{ISO8601} %5p [%t] %logger{40}:%L - %m%n</pattern>
8+
</encoder>
9+
</appender>
1010

11-
<appender name="JSON_SYSLOG" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
12-
<destination>host.docker.internal:514</destination>
11+
<appender name="JSON_SYSLOG" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
12+
<destination>host.docker.internal:514</destination>
1313
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
14-
<customFields>{"app":"invite"}</customFields>
15-
<includeCallerData>true</includeCallerData>
16-
<fieldNames>
17-
<thread>[ignore]</thread>
18-
<version>[ignore]</version>
19-
<levelValue>[ignore]</levelValue>
20-
</fieldNames>
21-
<prefix class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
22-
<layout class="ch.qos.logback.classic.PatternLayout">
23-
<pattern>invitejson: </pattern>
24-
</layout>
25-
</prefix>
26-
</encoder>
14+
<customFields>{"app":"invite"}</customFields>
15+
<includeCallerData>true</includeCallerData>
16+
<fieldNames>
17+
<thread>[ignore]</thread>
18+
<version>[ignore]</version>
19+
<levelValue>[ignore]</levelValue>
20+
</fieldNames>
21+
<prefix class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
22+
<layout class="ch.qos.logback.classic.PatternLayout">
23+
<pattern>invitejson:</pattern>
24+
</layout>
25+
</prefix>
26+
</encoder>
2727
</appender>
2828

29-
<logger name="invite" level="DEBUG" />
30-
<logger name="org.springframework.security" level="WARN" />
31-
<logger name="org.springframework" level="WARN" />
32-
<logger name="org.springframework.security" level="WARN" />
33-
<logger name="com.zaxxer.hikari" level="ERROR" />
29+
<logger name="invite" level="DEBUG"/>
30+
<logger name="org.springframework.security" level="WARN"/>
31+
<logger name="org.springframework" level="WARN"/>
32+
<logger name="org.springframework.security" level="WARN"/>
33+
<logger name="com.zaxxer.hikari" level="ERROR"/>
3434

35-
<root level="WARN">
36-
<appender-ref ref="STDOUT" />
37-
{% if invite_logback_json | bool %}
38-
<appender-ref ref="JSON_SYSLOG" />
39-
{%endif%}
40-
</root>
35+
<root level="WARN">
36+
<appender-ref ref="STDOUT"/>
37+
{% if invite_logback_json | bool %}
38+
<appender-ref ref="JSON_SYSLOG"/>
39+
{% endif %}
40+
</root>
4141

4242
</configuration>

‎roles/manage/templates/logback.xml.j2‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<configuration scan="true">
33

4-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder>
6-
<pattern>%d{ISO8601} %5p [%t] %logger{40}:%L - %m%n</pattern>
7-
</encoder>
8-
</appender>
9-
10-
<appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender">
11-
<smtpHost>{{ smtp_server }}</smtpHost>
12-
<from>{{ noreply_email }}</from>
13-
<to>{{ error_mail_to }}</to>
14-
<subject>{{ error_subject_prefix }}Unexpected error manage</subject>
15-
<layout class="ch.qos.logback.classic.html.HTMLLayout"/>
4+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5+
<encoder>
6+
<pattern>%d{ISO8601} %5p [%t] %logger{40}:%L - %m%n</pattern>
7+
</encoder>
8+
</appender>
9+
10+
<appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender">
11+
<smtpHost>{{ smtp_server }}</smtpHost>
12+
<from>{{ noreply_email }}</from>
13+
<to>{{ error_mail_to }}</to>
14+
<subject>{{ error_subject_prefix }}Unexpected error manage</subject>
15+
<layout class="ch.qos.logback.classic.html.HTMLLayout"/>
1616

1717
<filter class="filter.CustomThresholdFilter">
18-
<clazz>org.everit.json.schema.ValidationException</clazz>
19-
<level>ERROR</level>
20-
</filter>
21-
</appender>
18+
<clazz>org.everit.json.schema.ValidationException</clazz>
19+
<level>ERROR</level>
20+
</filter>
21+
</appender>
2222

2323
<appender name="JSON_SYSLOG" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
2424
<destination>host.docker.internal:514</destination>
25-
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
26-
<customFields>{"app":"manage"}</customFields>
27-
<includeCallerData>true</includeCallerData>
28-
<fieldNames>
29-
<thread>[ignore]</thread>
30-
<version>[ignore]</version>
31-
<levelValue>[ignore]</levelValue>
32-
</fieldNames>
33-
</encoder>
34-
</appender>
35-
36-
37-
<logger name="manage" level="DEBUG" />
38-
<logger name="com.github.cloudyrock" level="INFO" />
39-
40-
<root level="WARN">
41-
<appender-ref ref="STDOUT" />
42-
<appender-ref ref="EMAIL" />
43-
{% if manage_logback_json | bool -%}
44-
<appender-ref ref="JSON_SYSLOG" />
45-
{%endif%}
46-
</root>
25+
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
26+
<customFields>{"app":"manage"}</customFields>
27+
<includeCallerData>true</includeCallerData>
28+
<fieldNames>
29+
<thread>[ignore]</thread>
30+
<version>[ignore]</version>
31+
<levelValue>[ignore]</levelValue>
32+
</fieldNames>
33+
</encoder>
34+
</appender>
35+
36+
37+
<logger name="manage" level="DEBUG"/>
38+
<logger name="com.github.cloudyrock" level="INFO"/>
39+
40+
<root level="WARN">
41+
<appender-ref ref="STDOUT"/>
42+
<appender-ref ref="EMAIL"/>
43+
{% if manage_logback_json | bool -%}
44+
<appender-ref ref="JSON_SYSLOG"/>
45+
{% endif %}
46+
</root>
4747

4848
</configuration>

‎roles/oidcng/templates/logback.xml.j2‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,54 +2,54 @@
22
<?xml version="1.0" encoding="UTF-8"?>
33
<configuration scan="true">
44

5-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
6-
<encoder>
7-
<pattern>%d{ISO8601} %5p [%t] %logger{40}:%L - %m%n</pattern>
8-
</encoder>
9-
</appender>
5+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
6+
<encoder>
7+
<pattern>%d{ISO8601} %5p [%t] %logger{40}:%L - %m%n</pattern>
8+
</encoder>
9+
</appender>
1010

11-
<appender name="JSON_SYSLOG" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
12-
<destination>host.docker.internal:514</destination>
11+
<appender name="JSON_SYSLOG" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
12+
<destination>host.docker.internal:514</destination>
1313
<encoder class="net.logstash.logback.encoder.LogstashEncoder">
14-
<customFields>{"app":"oidcng"}</customFields>
15-
<includeCallerData>true</includeCallerData>
16-
<fieldNames>
17-
<thread>[ignore]</thread>
18-
<version>[ignore]</version>
19-
<levelValue>[ignore]</levelValue>
20-
</fieldNames>
21-
</encoder>
14+
<customFields>{"app":"oidcng"}</customFields>
15+
<includeCallerData>true</includeCallerData>
16+
<fieldNames>
17+
<thread>[ignore]</thread>
18+
<version>[ignore]</version>
19+
<levelValue>[ignore]</levelValue>
20+
</fieldNames>
21+
</encoder>
2222
</appender>
2323

24-
<appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender">
25-
<smtpHost>{{ smtp_server }}</smtpHost>
26-
<from>{{ noreply_email }}</from>
27-
<to>{{ error_mail_to }}</to>
28-
<subject>{{ error_subject_prefix }}Unexpected error oidcng</subject>
29-
<layout class="ch.qos.logback.classic.html.HTMLLayout"/>
24+
<appender name="EMAIL" class="ch.qos.logback.classic.net.SMTPAppender">
25+
<smtpHost>{{ smtp_server }}</smtpHost>
26+
<from>{{ noreply_email }}</from>
27+
<to>{{ error_mail_to }}</to>
28+
<subject>{{ error_subject_prefix }}Unexpected error oidcng</subject>
29+
<layout class="ch.qos.logback.classic.html.HTMLLayout"/>
3030

3131
<filter class="filter.CustomThresholdFilter">
32-
<clazz>com.nimbusds.oauth2.sdk.ParseException</clazz>
33-
<clazz>org.springframework.security.authentication.BadCredentialsException</clazz>
34-
<clazz>oidc.exceptions.UnauthorizedException</clazz>
35-
<clazz>oidc.exceptions.RedirectMismatchException</clazz>
36-
<clazz>org.springframework.dao.EmptyResultDataAccessException</clazz>
37-
<clazz>java.lang.IllegalArgumentException</clazz>
38-
<level>ERROR</level>
39-
</filter>
40-
</appender>
32+
<clazz>com.nimbusds.oauth2.sdk.ParseException</clazz>
33+
<clazz>org.springframework.security.authentication.BadCredentialsException</clazz>
34+
<clazz>oidc.exceptions.UnauthorizedException</clazz>
35+
<clazz>oidc.exceptions.RedirectMismatchException</clazz>
36+
<clazz>org.springframework.dao.EmptyResultDataAccessException</clazz>
37+
<clazz>java.lang.IllegalArgumentException</clazz>
38+
<level>ERROR</level>
39+
</filter>
40+
</appender>
4141

42-
<logger name="oidc" level="INFO" />
43-
<logger name="com.github.cloudyrock.mongock" level="INFO" />
44-
<logger name="org.springframework" level="INFO" />
45-
<root level="WARN">
46-
{%if oidcng_logback_email |bool %}
47-
<appender-ref ref="EMAIL" />
48-
{%endif%}
49-
<appender-ref ref="STDOUT" />
50-
{%if oidcng_logback_json |bool %}
51-
<appender-ref ref="JSON_SYSLOG" />
52-
{%endif%}
53-
</root>
42+
<logger name="oidc" level="INFO"/>
43+
<logger name="com.github.cloudyrock.mongock" level="INFO"/>
44+
<logger name="org.springframework" level="INFO"/>
45+
<root level="WARN">
46+
{% if oidcng_logback_email |bool %}
47+
<appender-ref ref="EMAIL"/>
48+
{% endif %}
49+
<appender-ref ref="STDOUT"/>
50+
{% if oidcng_logback_json |bool %}
51+
<appender-ref ref="JSON_SYSLOG"/>
52+
{% endif %}
53+
</root>
5454

5555
</configuration>

0 commit comments

Comments
 (0)