summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/localrpc
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/localrpc')
-rw-r--r--src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java5
-rw-r--r--src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java
index 6b2769b..9c86ea7 100644
--- a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java
+++ b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java
@@ -1,6 +1,7 @@
package org.openslx.imagemaster.localrpc;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.openslx.bwlp.thrift.iface.Role;
import org.openslx.bwlp.thrift.iface.UserInfo;
import org.openslx.imagemaster.util.Util;
@@ -8,7 +9,7 @@ import org.openslx.imagemaster.util.Util;
public class JsonUser
{
- private static final Logger LOGGER = Logger.getLogger( JsonUser.class );
+ private static final Logger LOGGER = LogManager.getLogger( JsonUser.class );
private String userId = null;
private String organizationId = null;
diff --git a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java
index 5caeab3..228d793 100644
--- a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java
+++ b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java
@@ -10,7 +10,8 @@ import java.nio.charset.StandardCharsets;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.openslx.bwlp.thrift.iface.ClientSessionData;
import org.openslx.bwlp.thrift.iface.UserInfo;
import org.openslx.imagemaster.session.Session;
@@ -25,7 +26,7 @@ import com.google.gson.Gson;
public class NetworkHandler implements Runnable
{
- private static final Logger log = Logger.getLogger( NetworkHandler.class );
+ private static final Logger log = LogManager.getLogger( NetworkHandler.class );
private Thread sendThread = null;
/**