diff options
Diffstat (limited to 'src/main/java/org/openslx/filetransfer')
11 files changed, 32 insertions, 28 deletions
diff --git a/src/main/java/org/openslx/filetransfer/ClassTest.java b/src/main/java/org/openslx/filetransfer/ClassTest.java index 9d5bc82..04dc40d 100644 --- a/src/main/java/org/openslx/filetransfer/ClassTest.java +++ b/src/main/java/org/openslx/filetransfer/ClassTest.java @@ -28,8 +28,8 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; -import org.apache.log4j.BasicConfigurator; -import org.slf4j.LoggerFactory; +import org.apache.logging.log4j.core.config.Configurator; +import org.apache.logging.log4j.core.config.DefaultConfiguration; public class ClassTest { @@ -39,15 +39,10 @@ public class ClassTest private static String inFile; private static String outFile; - static { - // This is a temporary workaround for this annoying log4j error msg. - // Initializing the logger before anything else is done. - BasicConfigurator.configure(); - LoggerFactory.getLogger( "ROOT" ); - } - public static void main( String[] args ) throws Exception { + Configurator.initialize(new DefaultConfiguration()); + if ( args.length != 4 ) { System.out.println( "Need 4 argument: <keystore> <passphrase> <infile> <outfile>" ); System.exit( 1 ); diff --git a/src/main/java/org/openslx/filetransfer/Downloader.java b/src/main/java/org/openslx/filetransfer/Downloader.java index 50162fc..13bd95c 100644 --- a/src/main/java/org/openslx/filetransfer/Downloader.java +++ b/src/main/java/org/openslx/filetransfer/Downloader.java @@ -12,12 +12,13 @@ import javax.net.ssl.SSLContext; import net.jpountz.lz4.LZ4FastDecompressor; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Downloader extends Transfer { - private static final Logger log = Logger.getLogger( Downloader.class ); + private static final Logger log = LogManager.getLogger( Downloader.class ); private final LZ4FastDecompressor decompressor = lz4factory.fastDecompressor(); diff --git a/src/main/java/org/openslx/filetransfer/Listener.java b/src/main/java/org/openslx/filetransfer/Listener.java index a0fc172..92a26cd 100644 --- a/src/main/java/org/openslx/filetransfer/Listener.java +++ b/src/main/java/org/openslx/filetransfer/Listener.java @@ -13,7 +13,8 @@ import java.util.concurrent.TimeUnit; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLServerSocketFactory; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.util.PrioThreadFactory; public class Listener @@ -29,7 +30,7 @@ public class Listener private static final byte CONNECTING_PEER_WANTS_TO_UPLOAD = 85; // hex - code 'U' = 85. private static final byte CONNECTING_PEER_WANTS_TO_DOWNLOAD = 68; // hex - code 'D' = 68. - private static Logger log = Logger.getLogger( Listener.class ); + private static Logger log = LogManager.getLogger( Listener.class ); /***********************************************************************/ /** diff --git a/src/main/java/org/openslx/filetransfer/Transfer.java b/src/main/java/org/openslx/filetransfer/Transfer.java index 589d142..c396d6e 100644 --- a/src/main/java/org/openslx/filetransfer/Transfer.java +++ b/src/main/java/org/openslx/filetransfer/Transfer.java @@ -15,7 +15,7 @@ import javax.net.ssl.SSLSocketFactory; import net.jpountz.lz4.LZ4Factory; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; import org.openslx.util.Util; public abstract class Transfer diff --git a/src/main/java/org/openslx/filetransfer/Uploader.java b/src/main/java/org/openslx/filetransfer/Uploader.java index 39bfea2..73445aa 100644 --- a/src/main/java/org/openslx/filetransfer/Uploader.java +++ b/src/main/java/org/openslx/filetransfer/Uploader.java @@ -12,12 +12,13 @@ import javax.net.ssl.SSLContext; import net.jpountz.lz4.LZ4Compressor; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class Uploader extends Transfer { - private static final Logger log = Logger.getLogger( Uploader.class ); + private static final Logger log = LogManager.getLogger( Uploader.class ); private final LZ4Compressor compressor = lz4factory.fastCompressor(); diff --git a/src/main/java/org/openslx/filetransfer/util/ChunkList.java b/src/main/java/org/openslx/filetransfer/util/ChunkList.java index 91d6f1e..ef327e5 100644 --- a/src/main/java/org/openslx/filetransfer/util/ChunkList.java +++ b/src/main/java/org/openslx/filetransfer/util/ChunkList.java @@ -10,14 +10,15 @@ import java.util.LinkedList; import java.util.List; import java.util.zip.CRC32; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.filetransfer.LocalChunkSource.ChunkSource; import org.openslx.util.ThriftUtil; public class ChunkList { - private static final Logger LOGGER = Logger.getLogger( ChunkList.class ); + private static final Logger LOGGER = LogManager.getLogger( ChunkList.class ); /** * Here we keep a list of all chunks in the proper order, in case we quickly need to access one diff --git a/src/main/java/org/openslx/filetransfer/util/FileChunk.java b/src/main/java/org/openslx/filetransfer/util/FileChunk.java index 6594e31..99b30ea 100644 --- a/src/main/java/org/openslx/filetransfer/util/FileChunk.java +++ b/src/main/java/org/openslx/filetransfer/util/FileChunk.java @@ -5,14 +5,15 @@ import java.util.Iterator; import java.util.List; import java.util.zip.CRC32; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.filetransfer.FileRange; import org.openslx.filetransfer.LocalChunkSource.ChunkSource; public class FileChunk { - private static final Logger LOGGER = Logger.getLogger( FileChunk.class ); + private static final Logger LOGGER = LogManager.getLogger( FileChunk.class ); /** * Length in bytes of binary sha1 representation diff --git a/src/main/java/org/openslx/filetransfer/util/HashChecker.java b/src/main/java/org/openslx/filetransfer/util/HashChecker.java index f6b27f7..f6f8876 100644 --- a/src/main/java/org/openslx/filetransfer/util/HashChecker.java +++ b/src/main/java/org/openslx/filetransfer/util/HashChecker.java @@ -9,7 +9,8 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; public class HashChecker { @@ -17,7 +18,7 @@ public class HashChecker public static final int CALC_HASH = 2; public static final int CALC_CRC32 = 4; - private static final Logger LOGGER = Logger.getLogger( HashChecker.class ); + private static final Logger LOGGER = LogManager.getLogger( HashChecker.class ); private final BlockingQueue<HashTask> queue; diff --git a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java index 300a75f..cadcf3c 100644 --- a/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java +++ b/src/main/java/org/openslx/filetransfer/util/IncomingTransferBase.java @@ -14,7 +14,8 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.ExecutorService; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.TransferState; import org.openslx.bwlp.thrift.iface.TransferStatus; import org.openslx.filetransfer.DataReceivedCallback; @@ -30,7 +31,7 @@ import org.openslx.util.ThriftUtil; public abstract class IncomingTransferBase extends AbstractTransfer implements HashCheckCallback { - private static final Logger LOGGER = Logger.getLogger( IncomingTransferBase.class ); + private static final Logger LOGGER = LogManager.getLogger( IncomingTransferBase.class ); /** * Remote peer is uploading, so on our end, we have Downloaders diff --git a/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java b/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java index 54dd2d0..e1fad97 100644 --- a/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java +++ b/src/main/java/org/openslx/filetransfer/util/LocalCopyManager.java @@ -9,7 +9,8 @@ import java.util.concurrent.Semaphore; 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.filetransfer.LocalChunkSource.ChunkSource; import org.openslx.filetransfer.LocalChunkSource.SourceFile; import org.openslx.util.Util; @@ -17,7 +18,7 @@ import org.openslx.util.Util; public class LocalCopyManager extends Thread { - private static final Logger LOGGER = Logger.getLogger( LocalCopyManager.class ); + private static final Logger LOGGER = LogManager.getLogger( LocalCopyManager.class ); private FileChunk currentChunk = null; diff --git a/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java b/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java index 18296c5..15c86fb 100644 --- a/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java +++ b/src/main/java/org/openslx/filetransfer/util/OutgoingTransferBase.java @@ -6,7 +6,8 @@ import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.TransferInformation; import org.openslx.filetransfer.Uploader; @@ -17,7 +18,7 @@ public abstract class OutgoingTransferBase extends AbstractTransfer * Constants */ - private static final Logger LOGGER = Logger.getLogger( OutgoingTransferBase.class ); + private static final Logger LOGGER = LogManager.getLogger( OutgoingTransferBase.class ); private static final long INACTIVITY_TIMEOUT = TimeUnit.MINUTES.toMillis( 5 ); |