diff options
Diffstat (limited to 'daemon/src/main')
8 files changed, 93 insertions, 93 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(); diff --git a/daemon/src/main/java/org/openslx/taskmanager/Environment.java b/daemon/src/main/java/org/openslx/taskmanager/Environment.java deleted file mode 100644 index acbfad4..0000000 --- a/daemon/src/main/java/org/openslx/taskmanager/Environment.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.openslx.taskmanager; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.log4j.Logger; - -/** - * Holds the environment that tasks running a system command *should* - * use. The environment is read from a config file. - */ -public class Environment -{ - - private static final Logger log = Logger.getLogger( Environment.class ); - - private static Map<String, String> env = new LinkedHashMap<>(); - - public static boolean load( String fileName ) - { - try { - FileReader fileReader = new FileReader( fileName ); - BufferedReader bufferedReader = new BufferedReader( fileReader ); - - Map<String, String> env = new LinkedHashMap<>(); - String line = null; - while ( ( line = bufferedReader.readLine() ) != null ) { - if ( !line.matches( "^[a-zA-Z0-9_]+=" ) ) - continue; - String[] part = line.split( "=", 2 ); - env.put( part[0], part[1] ); - } - - bufferedReader.close(); - - Environment.env = env; - log.info( "Loaded " + env.size() + " environment lines." ); - } catch ( IOException e ) { - log.info( "Could not load environment definition from " + fileName + ". Processes might use the same environment as this thread." ); - return false; - } - return true; - } - - public static void set( Map<String, String> environment ) - { - environment.clear(); - environment.putAll( env ); - } - - public static String[] get() - { - // Get reference to env so it doesn't change while in this function (load() from other thread) - Map<String, String> env = Environment.env; - String ret[] = new String[ env.size() ]; - int i = 0; - for ( Entry<String, String> it : env.entrySet() ) { - ret[i++] = it.getKey() + "=" + it.getValue(); - } - return ret; - } - -} diff --git a/daemon/src/main/java/org/openslx/taskmanager/Global.java b/daemon/src/main/java/org/openslx/taskmanager/Global.java index 5be8196..cdba3f8 100644 --- a/daemon/src/main/java/org/openslx/taskmanager/Global.java +++ b/daemon/src/main/java/org/openslx/taskmanager/Global.java @@ -11,13 +11,14 @@ import java.nio.file.Paths; import java.nio.file.attribute.PosixFilePermission; import java.util.Properties; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.taskmanager.util.Util; public class Global { - private static final Logger log = Logger.getLogger( Global.class ); + private static final Logger log = LogManager.getLogger( Global.class ); public static final String TASK_PACKAGE_NAME = "org.openslx.taskmanager.tasks"; diff --git a/daemon/src/main/java/org/openslx/taskmanager/main/Taskmanager.java b/daemon/src/main/java/org/openslx/taskmanager/main/Taskmanager.java index 7b854c3..77d3405 100644 --- a/daemon/src/main/java/org/openslx/taskmanager/main/Taskmanager.java +++ b/daemon/src/main/java/org/openslx/taskmanager/main/Taskmanager.java @@ -6,10 +6,13 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.Semaphore; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.taskmanager.Global; import org.openslx.taskmanager.api.AbstractTask; import org.openslx.taskmanager.api.CancellableTask; @@ -24,10 +27,18 @@ import com.google.gson.JsonSyntaxException; public class Taskmanager implements FinishCallback, Runnable { - private static final Logger log = Logger.getLogger( Taskmanager.class ); + private static final Logger log = LogManager.getLogger( Taskmanager.class ); private final ThreadPoolExecutor threadPool = new ThreadPoolExecutor( 8, 32, 1, TimeUnit.MINUTES, - new ArrayBlockingQueue<Runnable>( 4 ) ); + new ArrayBlockingQueue<Runnable>( 4 ), new ThreadFactory() { + AtomicInteger id = new AtomicInteger(); + + @Override + public Thread newThread( Runnable r ) + { + return new Thread( r, "Task-" + id.incrementAndGet() ); + } + } ); /** * gson object for (de)serialization diff --git a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java index 540ff42..6492f2e 100644 --- a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java +++ b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerTcp.java @@ -9,10 +9,13 @@ import java.net.Socket; import java.nio.charset.StandardCharsets; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.SynchronousQueue; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.taskmanager.Global; /** @@ -22,14 +25,22 @@ import org.openslx.taskmanager.Global; public class NetworkHandlerTcp extends NetworkHandlerBase { - private static final Logger log = Logger.getLogger( NetworkHandlerTcp.class ); + private static final Logger log = LogManager.getLogger( NetworkHandlerTcp.class ); /** * UDP socket for sending and receiving. */ private final ServerSocket socket; - private final ThreadPoolExecutor threadPool = new ThreadPoolExecutor( 1, 8, 1, TimeUnit.MINUTES, new SynchronousQueue<Runnable>() ); + private final ThreadPoolExecutor threadPool = new ThreadPoolExecutor( 0, 64, 1, TimeUnit.MINUTES, new SynchronousQueue<Runnable>(), new ThreadFactory() { + AtomicInteger id = new AtomicInteger(); + + @Override + public Thread newThread( Runnable r ) + { + return new Thread( r, "TCP-" + id.incrementAndGet() ); + } + } ); /** * Initialize the NetworkHandler by starting threads and opening the socket. @@ -77,7 +88,7 @@ public class NetworkHandlerTcp extends NetworkHandlerBase } finally { Thread.currentThread().interrupt(); Global.doShutdown = true; - log.info( "UDP receiver finished." ); + log.info( "TCP receiver finished." ); } } @@ -86,7 +97,7 @@ public class NetworkHandlerTcp extends NetworkHandlerBase private final Socket socket; private DataOutputStream writer = null; private DataInputStream reader = null; - + public ClientTask( Socket client ) { this.socket = client; @@ -97,7 +108,6 @@ public class NetworkHandlerTcp extends NetworkHandlerBase { try { try { - socket.setSoTimeout( (int)TimeUnit.MINUTES.toMillis( 15 ) ); reader = new DataInputStream( socket.getInputStream() ); writer = new DataOutputStream( socket.getOutputStream() ); } catch ( IOException e ) { @@ -145,7 +155,7 @@ public class NetworkHandlerTcp extends NetworkHandlerBase } } } - + private void sendMsg( String reply ) throws SendException { sendMsg( reply.getBytes( StandardCharsets.UTF_8 ) ); @@ -154,6 +164,7 @@ public class NetworkHandlerTcp extends NetworkHandlerBase private void sendMsg( byte[] reply ) throws SendException { try { + socket.setSoTimeout( (int)TimeUnit.SECONDS.toMillis( 15 ) ); writer.writeInt( reply.length ); writer.write( reply ); } catch ( IOException e ) { @@ -165,6 +176,7 @@ public class NetworkHandlerTcp extends NetworkHandlerBase { int bytes; try { + socket.setSoTimeout( (int)TimeUnit.MINUTES.toMillis( 15 ) ); bytes = reader.readInt(); } catch ( IOException e ) { // This should be fine... Client went away @@ -178,16 +190,24 @@ public class NetworkHandlerTcp extends NetworkHandlerBase return ""; // Nothing to read byte[] buffer = new byte[ bytes ]; try { + socket.setSoTimeout( (int)TimeUnit.SECONDS.toMillis( 2 ) ); reader.readFully( buffer ); } catch ( IOException e ) { log.warn( "Client went away when trying to read payload" ); return null; } return new String( buffer, StandardCharsets.UTF_8 ); - } + } + + } + + private static class SendException extends Exception + { + /** + * Version for serialization. + */ + private static final long serialVersionUID = 7591668934699490535L; } - - private static class SendException extends Exception {} } diff --git a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java index 7a25ed1..767e6a4 100644 --- a/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.java +++ b/daemon/src/main/java/org/openslx/taskmanager/network/NetworkHandlerUdp.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.taskmanager.Global; /** @@ -20,7 +21,7 @@ import org.openslx.taskmanager.Global; public class NetworkHandlerUdp extends NetworkHandlerBase { - private static final Logger log = Logger.getLogger( NetworkHandlerUdp.class ); + private static final Logger log = LogManager.getLogger( NetworkHandlerUdp.class ); private Thread sendThread = null; /** diff --git a/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java b/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java index 55a44a5..09b94ce 100644 --- a/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java +++ b/daemon/src/main/java/org/openslx/taskmanager/network/RequestParser.java @@ -3,7 +3,8 @@ package org.openslx.taskmanager.network; import java.nio.charset.StandardCharsets; import java.util.zip.Deflater; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.taskmanager.api.BoundedLog; import org.openslx.taskmanager.api.TaskStatus; import org.openslx.taskmanager.main.Taskmanager; @@ -14,7 +15,7 @@ import com.google.gson.GsonBuilder; public class RequestParser { - private static final Logger log = Logger.getLogger( RequestParser.class ); + private static final Logger log = LogManager.getLogger( RequestParser.class ); /** * Our very own gson instance (for serializing replies) diff --git a/daemon/src/main/properties/log4j2.properties b/daemon/src/main/properties/log4j2.properties new file mode 100644 index 0000000..563fe8d --- /dev/null +++ b/daemon/src/main/properties/log4j2.properties @@ -0,0 +1,21 @@ +status=error +name=log4j2PropertiesConfig + +# +# root level logging configuration +# +rootLogger.level=all +rootLogger.appenderRefs=stdout +rootLogger.appenderRef.stdout.ref=logToConsole + +# +# configuration for console output +# +appenders=console + +appender.console.type=Console +appender.console.name=logToConsole +appender.console.layout.type=PatternLayout +appender.console.layout.pattern=[%t] %-5p %F - %m%n +appender.console.filter.threshold.type=ThresholdFilter +appender.console.filter.threshold.level=info |