diff options
author | Michael Petretti | 2014-06-19 15:11:07 +0200 |
---|---|---|
committer | Michael Petretti | 2014-06-19 15:11:07 +0200 |
commit | 5a017c3b1ce7c65728ac354ebc138838e9db3320 (patch) | |
tree | 3ee98690b3e029cc8e76a335b5c30e0d96c533ae /src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java | |
parent | small changes (diff) | |
download | satellite-daemon-5a017c3b1ce7c65728ac354ebc138838e9db3320.tar.gz satellite-daemon-5a017c3b1ce7c65728ac354ebc138838e9db3320.tar.xz satellite-daemon-5a017c3b1ce7c65728ac354ebc138838e9db3320.zip |
Finished Debug for Uploads.
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java')
-rw-r--r-- | src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java index 8174787..80e4d1a 100644 --- a/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java +++ b/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java @@ -13,6 +13,7 @@ import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; +import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPSClient; import org.apache.log4j.Logger; import org.openslx.imagemaster.thrift.iface.FtpCredentials; @@ -61,13 +62,16 @@ public class FtpUploadWorker implements Runnable } File file = new File( image.path ); FileInputStream fis = new FileInputStream( file ); + ftpClient.setFileType( FTP.BINARY_FILE_TYPE ); ftpClient.storeFile( image.name, fis ); + ThriftConnection.finishedUpload( ftpc.username, imDat ); } catch (IOException e) { log.error("FtpUploadWorker: Error creating the FileInputStream"); } finally { ftpClient.disconnect(); + log.info( "FtpUploadWorker: ftpClient disconnected" ); } } catch ( NoSuchAlgorithmException | KeyStoreException | CertificateException | IOException e ) { log.debug( "FtpUploadWorker: Problem with Keystore ore FtpsClient creation." ); |