summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java')
-rw-r--r--src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java23
1 files changed, 11 insertions, 12 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
index 09e412a..b7b87cb 100644
--- a/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
+++ b/src/main/java/org/openslx/satellitedaemon/filetransfer/FileUploadWorker.java
@@ -1,6 +1,5 @@
package org.openslx.satellitedaemon.filetransfer;
-import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.UUID;
@@ -37,12 +36,12 @@ public class FileUploadWorker implements Runnable
// Only for testing because a random UUID is used. Later the method above should be used.
ImageData imDat = new ImageData(
UUID.randomUUID().toString(), image.rid,
- image.name, (System.currentTimeMillis() / 1000),
- (System.currentTimeMillis() / 1000), image.creator, "anyThing",
- true, false, "best", "theVeryBest", image.fileSize );
+ image.name, ( System.currentTimeMillis() / 1000 ),
+ ( System.currentTimeMillis() / 1000 ), image.creator, "anyThing",
+ true, false, "best", image.fileSize );
String path = Globals.getImageFolder() + "/" + image.path;
-
+
// ThriftConnection.getUploadInfos returns uploadInfo and handles ThriftAuthentication
UploadData upInfos = ThriftConnection.getUploadInfos( imDat, path );
if ( upInfos == null ) {
@@ -57,18 +56,18 @@ public class FileUploadWorker implements Runnable
try {
u = new Uploader( Globals.getMasterserverHost(),
upInfos.port, Globals.getMasterServerSslContext(), upInfos.token );
- } catch (IOException e) {
+ } catch ( IOException e ) {
e.printStackTrace();
continue;
}
-
+
// Start upload process.
- if (u.upload(path)) {
- u.close(null);
- log.info("Uploaded image successfuly.");
- image.updateStatus(Status.successfully_published);
+ if ( u.upload( path ) ) {
+ u.close( null );
+ log.info( "Uploaded image successfuly." );
+ image.updateStatus( Status.successfully_published );
}
-
+
}
try {
Thread.sleep( 1 * 60 * 1000 );