summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java')
-rw-r--r--src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java b/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java
index 69c73a9..91d4e9c 100644
--- a/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java
+++ b/src/main/java/org/openslx/satellitedaemon/ftp/FtpUploadWorker.java
@@ -17,6 +17,7 @@ import javax.net.ssl.TrustManager;
import javax.net.ssl.TrustManagerFactory;
import org.apache.commons.net.ftp.FTPSClient;
+import org.apache.log4j.Logger;
import org.openslx.imagemaster.thrift.iface.FtpCredentials;
import org.openslx.imagemaster.thrift.iface.ImageData;
import org.openslx.satellitedaemon.Globals;
@@ -26,8 +27,7 @@ import org.openslx.satellitedaemon.db.DbImage;
public class FtpUploadWorker implements Runnable
{
- static String nilsIp = "132.230.4.23";
- static int ftpPort = 2221;
+ private static Logger log = Logger.getLogger( FtpUploadWorker.class );
@Override
public void run()
@@ -44,9 +44,12 @@ public class FtpUploadWorker implements Runnable
true, false, "best", "theVeryBest", 1024 );
FtpCredentials ftpc = ThriftConnection.getFtpCredentials( imDat );
- // TODO: Handle ftpc == null
+ if (ftpc == null) {
+ log.error( "The FtpCredentials are null" );
+ }
try {
+ // ToDo: Add everything with the keyStores to config/global.properties
TrustManagerFactory trustManagerFactory = TrustManagerFactory
.getInstance( KeyManagerFactory.getDefaultAlgorithm() );
KeyStore keystore = KeyStore.getInstance( "JKS" );