Log4j2 (#94)

bullet-db · Jan 11, 2022 · 6b1d848 · 6b1d848
1 parent 5068090
commit 6b1d848
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 37 deletions.
diff --git a/pom.xml b/pom.xml
@@ -54,8 +54,10 @@
         <storm.version>2.2.0</storm.version>
         <storm.metrics.version>2.2.0</storm.metrics.version>
         <jackson.core.version>2.10.2</jackson.core.version>
-        <bullet.core.version>1.5.1</bullet.core.version>
-        <bullet.dsl.version>1.2.1</bullet.dsl.version>
+        <slf4j.version>1.7.32</slf4j.version>
+        <log4j.version>2.17.1</log4j.version>
+        <bullet.core.version>1.5.2</bullet.core.version>
+        <bullet.dsl.version>1.2.2</bullet.dsl.version>
     </properties>
 
     <dependencies>
@@ -85,34 +87,22 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.10</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.16.4</version>
             <scope>provided</scope>
         </dependency>
+        <!--  Technically the log4j binding brings this in but adding it explicitly to control versions and state the obvious -->
         <dependency>
-            <groupId>org.apache.storm</groupId>
-            <artifactId>storm-metrics</artifactId>
-            <version>${storm.metrics.version}</version>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.storm</groupId>
-            <artifactId>storm-core</artifactId>
-            <version>${storm.version}</version>
-            <scope>provided</scope>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <version>${log4j.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -145,6 +135,18 @@
             <artifactId>gson</artifactId>
             <version>2.7</version>
         </dependency>
+        <!-- Put storm last so that its transitives like log4j don't override ours -->
+        <dependency>
+            <groupId>org.apache.storm</groupId>
+            <artifactId>storm-metrics</artifactId>
+            <version>${storm.metrics.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.storm</groupId>
+            <artifactId>storm-core</artifactId>
+            <version>${storm.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties
@@ -0,0 +1,9 @@
+status=warn
+
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%-5p] %d{ISO8601} %c - %m%n
+
+rootLogger.level=warn
+rootLogger.appenderRef.stdout.ref=STDOUT
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
diff --git a/src/test/resources/log4j2.properties b/src/test/resources/log4j2.properties
@@ -0,0 +1,9 @@
+status=warn
+
+appender.console.type=Console
+appender.console.name=STDOUT
+appender.console.layout.type=PatternLayout
+appender.console.layout.pattern=[%-5p] %d{ISO8601} %c - %m%n
+
+rootLogger.level=fatal
+rootLogger.appenderRef.stdout.ref=STDOUT