diff options
Diffstat (limited to 'daemon/src/main/java/org/openslx/taskmanager/App.java')
| -rw-r--r-- | daemon/src/main/java/org/openslx/taskmanager/App.java | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/daemon/src/main/java/org/openslx/taskmanager/App.java b/daemon/src/main/java/org/openslx/taskmanager/App.java index d64929d..ac3dc71 100644 --- a/daemon/src/main/java/org/openslx/taskmanager/App.java +++ b/daemon/src/main/java/org/openslx/taskmanager/App.java @@ -4,12 +4,16 @@ 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; import org.openslx.taskmanager.network.NetworkHandlerUdp; import org.openslx.taskmanager.network.RequestParser; +import org.openslx.util.AppUtil; /** * Hello world! @@ -18,11 +22,19 @@ 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 ); + + private static final String NAME = "bwLehrpool-Taskmanager"; public static void main( String[] args ) throws InterruptedException, IOException { - BasicConfigurator.configure(); + // setup basic logging appender to log output on console if no external appender (log4j.properties) is configured + 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()); + if (Global.PORT_UDP == -1 && Global.PORT_TCP == -1) { log.fatal( "Neither UDP nor TCP configured" ); System.exit( 1 ); @@ -36,13 +48,13 @@ public class App NetworkHandlerTcp tcp = null; if (Global.PORT_UDP != -1) { udp = new NetworkHandlerUdp( Global.PORT_UDP, Global.LISTEN_ADDRESS, parser ); - threads.add( new Thread( udp ) ); + threads.add( new Thread( udp, "UDP:" + Global.PORT_UDP ) ); } if (Global.PORT_TCP != -1) { tcp = new NetworkHandlerTcp( Global.PORT_TCP, Global.LISTEN_ADDRESS, parser ); - threads.add( new Thread( tcp ) ); + threads.add( new Thread( tcp, "TCP:" + Global.PORT_TCP ) ); } - threads.add( new Thread( tm ) ); + threads.add( new Thread( tm, "Taskmanager" ) ); // Wait for everything for (Thread t : threads) { t.start(); |