summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java
diff options
context:
space:
mode:
authorNils Schwabe2014-07-23 14:19:46 +0200
committerNils Schwabe2014-07-23 14:19:46 +0200
commit56512f44aa6430aeeabe5b81057d30c169fce104 (patch)
tree9572b3984147b631a652c2a8118b6678e5e80f3f /src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java
parentAdd that client gets error if a certain block was transmitted to many times a... (diff)
downloadmasterserver-56512f44aa6430aeeabe5b81057d30c169fce104.tar.gz
masterserver-56512f44aa6430aeeabe5b81057d30c169fce104.tar.xz
masterserver-56512f44aa6430aeeabe5b81057d30c169fce104.zip
Fix some bugs while testing the connection
Change log level of thrift filetransfer to error in log4j properties
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java b/src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java
index f088af4..c47eb04 100644
--- a/src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java
+++ b/src/main/java/org/openslx/imagemaster/serverconnection/CRCScheduler.java
@@ -6,6 +6,7 @@ import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
+import org.apache.log4j.Logger;
import org.openslx.imagemaster.crcchecker.CRCChecker;
/**
@@ -14,28 +15,39 @@ import org.openslx.imagemaster.crcchecker.CRCChecker;
public class CRCScheduler extends TimerTask
{
+ private static Logger log = Logger.getLogger( CRCScheduler.class );
+
@Override
public void run()
{
+ log.debug( "Starting checks..." );
List<UploadingImage> list = ImageProcessor.getImagesToCheck();
+ log.debug(list);
Iterator<UploadingImage> iter = list.iterator();
while ( iter.hasNext() ) {
UploadingImage image = iter.next();
+ log.debug( "Checking blocks of " + image.getDbImage().imageName );
CRCChecker crcChecker = new CRCChecker( image.getImageFile(), image.getCrcFile() );
+ log.debug( "CRCFile is valid: " + crcChecker.hasValidCrcFile() );
for ( int block = 0; block < image.getNumberOfBlocks(); block++ ) {
if ( image.needsCheck( block ) ) {
try {
if ( crcChecker.checkBlock( block ) ) {
image.setValid( block );
+ log.debug( block + " was valid" );
} else {
image.setNeedsRequest( block );
+ log.debug( block + " was NOT valid" );
}
} catch ( IOException e ) {
// TODO: Handle that crc file or image file could not be read.
+ log.debug( "error" );
}
}
}
+ image.updateDb();
}
+ log.debug( "... done" );
}
public static void startScheduling()
@@ -43,7 +55,9 @@ public class CRCScheduler extends TimerTask
Timer timer = new Timer( "CRCScheduler" );
// start now and fire every 60 s
- timer.schedule( new CRCScheduler(), 0, 60000 );
+ //timer.schedule( new CRCScheduler(), 0, 60000L );
+
+ timer.schedule( new CRCScheduler(), 0L, 30000L );
}
}