diff options
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java')
| -rw-r--r-- | src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java index d019e53..e4e4b7c 100644 --- a/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java +++ b/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java @@ -32,6 +32,7 @@ public class FtpUploadWorker implements Runnable List<DbImage> imageList = new ArrayList<DbImage>(); while ( true ) { imageList = DbImage.getAllMarkedForUpload(); + // TODO: Maybe use iterator ( for (DbImage image : imageList) ) while ( !imageList.isEmpty() ) { // TODO: imDat should be filled by the first entry of imageList. // imageList.get(0); @@ -40,6 +41,7 @@ public class FtpUploadWorker implements Runnable true, false, "best", "theVeryBest", 1024 ); FtpCredentials ftpc = ThriftConnection.getFtpCredentials( imDat ); + // TODO: Handle ftpc == null try { TrustManagerFactory trustManagerFactory = TrustManagerFactory @@ -47,7 +49,7 @@ public class FtpUploadWorker implements Runnable KeyStore keystore = KeyStore.getInstance( "JKS" ); keystore.load( new FileInputStream( new File( "/home/michael/satellite-daemon/config/ftpsid.jks" ) ), - "password".toCharArray() ); + "password".toCharArray() ); // TODO: define relative path, eg. "config/masterserver_cert.jks" trustManagerFactory.init( keystore ); TrustManager trustManager = trustManagerFactory.getTrustManagers()[0]; FTPSClient ftpClient = new FTPSClient( "SSL", true ); @@ -55,16 +57,16 @@ public class FtpUploadWorker implements Runnable try { ftpClient.connect( nilsIp, ftpPort ); if ( !ftpClient.login( ftpc.username, ftpc.password ) ) { - throw new ConnectException( "Could not login." ); + throw new ConnectException( "Could not login." ); // TODO: Should not throw exception, otherwise we'd exit the run() method } // System.out.println( "Connected to " + nilsIp + ":" + ftpPort // + ". Reply code: " + ftpClient.getReplyCode() ); - // TODO: Where do I find the path to the db-image? + // TODO: Where do I find the path to the db-image? <-- in DbImage. It's relative, base path should come from config/???.properties (global static config class, see masterserver's Globals class) File file = new File( "/path/to/File" ); FileInputStream fis = new FileInputStream( file ); - // TODO: What is the path where it should be stored? + // TODO: What is the path where it should be stored? <-- Should be set in the FtpCredentials you get via Thrift, but doesn't really matter, Server can decide to ignore the name and pick own (talk to Nils) ftpClient.storeFile( "/path/where/theImage/belongs", fis ); } finally { |