diff options
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/ftp')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java | 17 |
2 files changed, 19 insertions, 2 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." ); diff --git a/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java b/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java index 0b22389..a2c990f 100644 --- a/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java +++ b/src/main/java/org/openslx/satellitedaemon/ftp/ThriftConnection.java @@ -18,6 +18,7 @@ import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransport; import org.openslx.imagemaster.thrift.iface.FtpCredentials; import org.openslx.imagemaster.thrift.iface.ImageData; +import org.openslx.imagemaster.thrift.iface.ImageDataException; import org.openslx.imagemaster.thrift.iface.ImageServer; import org.openslx.imagemaster.thrift.iface.ServerAuthenticationException; import org.openslx.imagemaster.thrift.iface.ServerSessionData; @@ -138,7 +139,7 @@ public class ThriftConnection e.printStackTrace(); return null; } catch ( TException e ) { - log.error( "ThriftConnection: TExeption: Server Authetication was not sucessful." ); + log.error( "ThriftConnection: TException: Server Authetication was not sucessful." ); e.printStackTrace(); return null; } @@ -154,7 +155,7 @@ public class ThriftConnection ImageServer.Client newClient = null; try { TTransport transport; // Is it really always the same IP:Port as from FTPServer? - transport = new TSocket( Globals.getPropertyString( PropString.FTPSERVERIP ), Globals.getPropertyInt( PropInt.FTPPORT ) ); + transport = new TSocket( Globals.getPropertyString( PropString.FTPSERVERIP ), Globals.getPropertyInt( PropInt.THRIFTPORT ) ); transport.open(); TProtocol protocol = new TBinaryProtocol( transport ); newClient = new ImageServer.Client( protocol ); @@ -166,5 +167,17 @@ public class ThriftConnection } return newClient; } + + public static void finishedUpload(String ftpUser, ImageData imageDescription) { + try { + client.finshedUpload( ftpUser, imageDescription ); + } catch ( ImageDataException e ) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch ( TException e ) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } |