summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/filetransfer/util/HashChecker.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/filetransfer/util/HashChecker.java')
-rw-r--r--src/main/java/org/openslx/filetransfer/util/HashChecker.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/filetransfer/util/HashChecker.java b/src/main/java/org/openslx/filetransfer/util/HashChecker.java
index f6b27f7..41bd05a 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;
@@ -136,7 +137,12 @@ public class HashChecker
chunk.setStatus( ChunkStatus.HASHING );
}
if ( blocking ) {
+ long pre = System.currentTimeMillis();
queue.put( task );
+ long duration = System.currentTimeMillis() - pre;
+ if ( duration > 1000 ) {
+ LOGGER.warn( "HashChecker.queue() took " + duration + "ms" );
+ }
} else {
if ( !queue.offer( task ) ) {
return false;
@@ -223,7 +229,7 @@ public class HashChecker
public static enum HashResult
{
- NONE, // No hashing tool place
+ NONE, // No hashing took place
VALID, // Hash matches
INVALID, // Hash does not match
FAILURE // Error calculating hash