diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/App.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/App.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java index f9b5399..f3a0aee 100644 --- a/src/main/java/org/openslx/imagemaster/App.java +++ b/src/main/java/org/openslx/imagemaster/App.java @@ -6,9 +6,10 @@ import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; -import org.apache.log4j.BasicConfigurator; -import org.apache.log4j.LogManager; -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.apache.thrift.transport.TTransportException; import org.openslx.imagemaster.localrpc.NetworkHandler; import org.openslx.imagemaster.thrift.server.BinaryListener; @@ -21,7 +22,7 @@ import org.openslx.util.AppUtil; public class App { - private static Logger log = Logger.getLogger( App.class ); + private static Logger log = LogManager.getLogger( App.class ); private static final String NAME = "Master-Server"; @@ -30,8 +31,8 @@ public class App public static void main( String[] args ) throws TTransportException, NoSuchAlgorithmException, SocketException { // setup basic logging appender to log output on console if no external appender (log4j.properties) is configured - if ( LogManager.getRootLogger().getAllAppenders() == null ) { - BasicConfigurator.configure(); + if (org.apache.logging.log4j.core.Logger.class.cast(LogManager.getRootLogger()).getAppenders().isEmpty()) { + Configurator.initialize(new DefaultConfiguration()); } AppUtil.logHeader( log, App.NAME, App.class.getPackage().getImplementationVersion() ); |