upgrade log4j2 to 2.17.0

gy2006 · gy2006 · commit 4a957c0882ea · 2021-12-20T19:29:02.000+01:00
diff --git a/core/src/main/java/com/flowci/core/common/config/AppConfig.java b/core/src/main/java/com/flowci/core/common/config/AppConfig.java
@@ -110,10 +110,16 @@ public void multicastEvent(ApplicationEvent event, ResolvableType eventType) {
                 ResolvableType type = (eventType != null ? eventType : resolveDefaultEventType(event));
                 Executor executor = getTaskExecutor();
                 for (ApplicationListener<?> listener : getApplicationListeners(event, type)) {
+                    if (executor == null) {
+                        invokeListener(listener, event);
+                        continue;
+                    }
+
                     if (listener instanceof AsyncEvent) {
                         executor.execute(() -> invokeListener(listener, event));
                         continue;
                     }
+
                     invokeListener(listener, event);
                 }
             }
diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
         <amqp-client.version>5.9.0</amqp-client.version>
         <java-jwt.version>3.8.1</java-jwt.version>
         <minio.version>6.0.11</minio.version>
-        <log4j.version>2.16.0</log4j.version>
+        <log4j.version>2.17.0</log4j.version>
         <kubernetes-client.version>4.10.3</kubernetes-client.version>
     </properties>
 

Original file line number	Diff line number	Diff line change
`@@ -110,10 +110,16 @@ public void multicastEvent(ApplicationEvent event, ResolvableType eventType) {`
`110`	`110`	`ResolvableType type = (eventType != null ? eventType : resolveDefaultEventType(event));`
`111`	`111`	`Executor executor = getTaskExecutor();`
`112`	`112`	`for (ApplicationListener<?> listener : getApplicationListeners(event, type)) {`
	`113`	`+ if (executor == null) {`
	`114`	`+ invokeListener(listener, event);`
	`115`	`+ continue;`
	`116`	`+ }`
	`117`	`+`
`113`	`118`	`if (listener instanceof AsyncEvent) {`
`114`	`119`	`executor.execute(() -> invokeListener(listener, event));`
`115`	`120`	`continue;`
`116`	`121`	`}`
	`122`	`+`
`117`	`123`	`invokeListener(listener, event);`
`118`	`124`	`}`
`119`	`125`	`}`