diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/thrift')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java | 5 | ||||
-rw-r--r-- | src/main/java/org/openslx/imagemaster/thrift/server/MasterServerHandler.java | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java b/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java index bf015a1..fab1e05 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java +++ b/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java @@ -6,7 +6,8 @@ import java.util.concurrent.TimeUnit; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.protocol.TProtocolFactory; import org.apache.thrift.server.THsHaServer; import org.apache.thrift.server.TServer; @@ -30,7 +31,7 @@ public class BinaryListener implements Runnable new MasterServerHandler() ); final TProtocolFactory protFactory = new TBinaryProtocolSafe.Factory( true, true ); - private static Logger log = Logger.getLogger( BinaryListener.class ); + private static Logger log = LogManager.getLogger( BinaryListener.class ); final TServer server; @Override diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/MasterServerHandler.java b/src/main/java/org/openslx/imagemaster/thrift/server/MasterServerHandler.java index deb2a33..1a41e2d 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/server/MasterServerHandler.java +++ b/src/main/java/org/openslx/imagemaster/thrift/server/MasterServerHandler.java @@ -9,7 +9,8 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.AuthorizationError; import org.openslx.bwlp.thrift.iface.ClientSessionData; @@ -62,7 +63,7 @@ import org.openslx.thrifthelper.ImagePublishDataEx; public class MasterServerHandler implements MasterServer.Iface { - private static final Logger LOGGER = Logger.getLogger( MasterServerHandler.class ); + private static final Logger LOGGER = LogManager.getLogger( MasterServerHandler.class ); @Override public boolean ping() |