From 932f537231cba02c9f08558475e6aea5a1c5d838 Mon Sep 17 00:00:00 2001
From: Manuel Bentele
Date: Thu, 16 Dec 2021 07:56:00 +0100
Subject: Update log4j because of the CVE-2021-44228 security flaw

---
 daemon/src/main/java/org/openslx/taskmanager/App.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'daemon/src/main/java/org/openslx/taskmanager/App.java')

diff --git a/daemon/src/main/java/org/openslx/taskmanager/App.java b/daemon/src/main/java/org/openslx/taskmanager/App.java
index 6580550..cf63448 100644
--- a/daemon/src/main/java/org/openslx/taskmanager/App.java
+++ b/daemon/src/main/java/org/openslx/taskmanager/App.java
@@ -4,8 +4,10 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.DefaultConfiguration;
 import org.openslx.taskmanager.api.Environment;
 import org.openslx.taskmanager.main.Taskmanager;
 import org.openslx.taskmanager.network.NetworkHandlerTcp;
@@ -19,11 +21,12 @@ import org.openslx.taskmanager.network.RequestParser;
 public class App
 {
 	
-	private static final Logger log = Logger.getLogger( App.class );
+	private static final Logger log = LogManager.getLogger( App.class );
 
 	public static void main( String[] args ) throws InterruptedException, IOException
 	{
-		BasicConfigurator.configure();
+		Configurator.initialize( new DefaultConfiguration() );
+
 		if (Global.PORT_UDP == -1 && Global.PORT_TCP == -1) {
 			log.fatal( "Neither UDP nor TCP configured" );
 			System.exit( 1 );
-- 
cgit v1.2.3-55-g7522