diff options
author | Nils Schwabe | 2014-04-28 18:18:59 +0200 |
---|---|---|
committer | Nils Schwabe | 2014-04-28 18:18:59 +0200 |
commit | 287ad92152c530b400a5405a4672a41d92e4d368 (patch) | |
tree | 42dcb2c698672ae371d70a81ea5c49f3280db9c6 /src/main/java/org/openslx/imagemaster/App.java | |
parent | Add remove image from process list (when user gets deleted after timeout) (diff) | |
download | masterserver-287ad92152c530b400a5405a4672a41d92e4d368.tar.gz masterserver-287ad92152c530b400a5405a4672a41d92e4d368.tar.xz masterserver-287ad92152c530b400a5405a4672a41d92e4d368.zip |
Add ftp users and images in processing list are remembered
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/App.java')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/App.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java index a73e1ef..e40dae3 100644 --- a/src/main/java/org/openslx/imagemaster/App.java +++ b/src/main/java/org/openslx/imagemaster/App.java @@ -7,6 +7,7 @@ import java.util.List; import org.apache.log4j.Logger; import org.openslx.imagemaster.Globals.PropInt; import org.openslx.imagemaster.ftp.FtpCredentialsScheduler; +import org.openslx.imagemaster.ftp.ImageProcessor; import org.openslx.imagemaster.ftp.MasterFtpServer; import org.openslx.imagemaster.thrift.server.BinaryListener; @@ -36,6 +37,9 @@ public class App System.exit( 1 ); } log.info( "Loaded config file" ); + + log.info( "Checking !uploading! db entries." ); + ImageProcessor.checkUploading(); // Create binary listener Thread t; @@ -44,7 +48,7 @@ public class App t.start(); // Create Ftp Server - ftpServer.init( Globals.getPropertyInt( PropInt.FTPPORT ) ); + ftpServer.init( Globals.getPropertyInt( PropInt.FTPPORT ) ); // this init needs to be done, because we have to wait for the config file Thread f; f = new Thread( ftpServer, "FtpServer" ); servers.add( f ); |