Skip to content

Commit fd8a6da

Browse files
anthonysenaanthonysena
authored
log4j v2 update (#1970)
* Update log4j2.xml configuration * Bump to log4j v2.17.1
1 parent 60c517a commit fd8a6da

File tree

3 files changed

+101
-58
lines changed

3 files changed

+101
-58
lines changed

‎pom.xml

+33-5
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
<!-- Spring Boot manages spring.version as well -->
1515
<spring.boot.version>1.5.22.RELEASE</spring.boot.version>
16+
<log4j2.version>2.17.1</log4j2.version>
1617
<flyway.version>4.2.0</flyway.version>
1718
<waffle.version>2.2.1</waffle.version>
1819
<jna.version>5.5.0</jna.version>
@@ -510,6 +511,26 @@
510511

511512
<dependencyManagement>
512513
<dependencies>
514+
<dependency>
515+
<groupId>org.apache.logging.log4j</groupId>
516+
<artifactId>log4j-api</artifactId>
517+
<version>${log4j2.version}</version>
518+
</dependency>
519+
<dependency>
520+
<groupId>org.apache.logging.log4j</groupId>
521+
<artifactId>log4j-core</artifactId>
522+
<version>${log4j2.version}</version>
523+
</dependency>
524+
<dependency>
525+
<groupId>org.apache.logging.log4j</groupId>
526+
<artifactId>log4j-web</artifactId>
527+
<version>${log4j2.version}</version>
528+
</dependency>
529+
<dependency>
530+
<groupId>org.apache.logging.log4j</groupId>
531+
<artifactId>log4j-slf4j-impl</artifactId>
532+
<version>${log4j2.version}</version>
533+
</dependency>
513534
<dependency>
514535
<!-- Import dependency management from Spring Boot -->
515536
<groupId>org.springframework.boot</groupId>
@@ -577,6 +598,10 @@
577598
</exclusion>
578599
</exclusions>
579600
</dependency>
601+
<dependency>
602+
<groupId>org.springframework.boot</groupId>
603+
<artifactId>spring-boot-starter-log4j2</artifactId>
604+
</dependency>
580605
<dependency>
581606
<groupId>org.springframework.boot</groupId>
582607
<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -731,6 +756,14 @@
731756
<groupId>com.fasterxml.jackson.core</groupId>
732757
<artifactId>jackson-databind</artifactId>
733758
</exclusion>
759+
<exclusion>
760+
<groupId>org.slf4j</groupId>
761+
<artifactId>slf4j-log4j12</artifactId>
762+
</exclusion>
763+
<exclusion>
764+
<groupId>log4j</groupId>
765+
<artifactId>log4j</artifactId>
766+
</exclusion>
734767
</exclusions>
735768
</dependency>
736769
<dependency>
@@ -1125,11 +1158,6 @@
11251158
<version>2.0.1</version>
11261159
<scope>test</scope>
11271160
</dependency>
1128-
<dependency>
1129-
<groupId>log4j</groupId>
1130-
<artifactId>log4j</artifactId>
1131-
<version>1.2.17</version>
1132-
</dependency>
11331161
<dependency>
11341162
<groupId>org.dom4j</groupId>
11351163
<artifactId>dom4j</artifactId>

‎src/main/resources/log4j.xml

-53
This file was deleted.

‎src/main/resources/log4j2.xml

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Configuration>
3+
<Properties>
4+
<property name="audit.trail.log.extraFile">${bundle:application:audit.trail.log.extraFile}</property>
5+
<property name="audit.trail.log.file">${bundle:application:audit.trail.log.file}</property>
6+
<property name="logging.level.org.apache.shiro">${bundle:application:logging.level.org.apache.shiro}</property>
7+
<property name="logging.level.org.ohdsi">${bundle:application:logging.level.org.ohdsi}</property>
8+
<property name="logging.level.org.pac4j">${bundle:application:logging.level.org.pac4j}</property>
9+
<property name="logging.level.org.springframework.orm">${bundle:application:logging.level.org.springframework.orm}</property>
10+
<property name="logging.level.org.springframework.jdbc">${bundle:application:logging.level.org.springframework.jdbc}</property>
11+
<property name="logging.level.root">${bundle:application:logging.level.root}</property>
12+
</Properties>
13+
<Appenders>
14+
<RollingFile name="audit" fileName="${audit.trail.log.file}"
15+
filePattern="/tmp/atlas/audit/audit-%d{yyyy-MM-dd}-%i.log">
16+
<PatternLayout>
17+
<Pattern>%m%n</Pattern>
18+
</PatternLayout>
19+
<Policies>
20+
<TimeBasedTriggeringPolicy interval="1" modulate="true" />
21+
</Policies>
22+
</RollingFile>
23+
<Async name="audit-async">
24+
<AppenderRef ref="audit"/>
25+
</Async>
26+
<RollingFile name="audit-extra" fileName="${audit.trail.log.extraFile}"
27+
filePattern="/tmp/atlas/audit/audit-extra-%d{yyyy-MM-dd}-%i.log">
28+
<PatternLayout>
29+
<Pattern>%m%n</Pattern>
30+
</PatternLayout>
31+
<Policies>
32+
<TimeBasedTriggeringPolicy interval="1" modulate="true" />
33+
</Policies>
34+
</RollingFile>
35+
<Async name="audit-extra-async">
36+
<AppenderRef ref="audit-extra"/>
37+
</Async>
38+
<Console name="Console" target="SYSTEM_OUT">
39+
<PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %p %t %C - %x - %m%n" />
40+
</Console>
41+
</Appenders>
42+
<Loggers>
43+
<Root level="${logging.level.root}">
44+
<AppenderRef ref="Console" />
45+
</Root>
46+
<logger name="audit">
47+
<AppenderRef ref="audit-async" />
48+
</logger>
49+
<logger name="audit-extra">
50+
<AppenderRef ref="audit-extra-async" />
51+
</logger>
52+
<logger name="org.ohdsi" level="${logging.level.org.ohdsi}">
53+
<AppenderRef ref="Console" />
54+
</logger>
55+
<logger name="org.springframework.orm" level="${logging.level.org.springframework.orm}">
56+
<AppenderRef ref="Console" />
57+
</logger>
58+
<logger name="org.springframework.jdbc" level="${logging.level.org.springframework.jdbc}">
59+
<AppenderRef ref="Console" />
60+
</logger>
61+
<logger name="org.apache.shiro" level="${logging.level.org.apache.shiro}">
62+
<AppenderRef ref="Console" />
63+
</logger>
64+
<logger name="org.pac4j" level="${logging.level.org.pac4j:level:-info}">
65+
<AppenderRef ref="Console" />
66+
</logger>
67+
</Loggers>
68+
</Configuration>

0 commit comments

Comments
 (0)