Added a Globals.java class for properties handling.

1 files changed, 27 insertions, 13 deletions

diff --git a/src/main/java/org/openslx/satellitedaemon/App.java b/src/main/java/org/openslx/satellitedaemon/App.java
index 7faf365..490ceba 100644
--- a/src/main/java/org/openslx/satellitedaemon/App.java
+++ b/src/main/java/org/openslx/satellitedaemon/App.java
@@ -9,6 +9,7 @@ import java.security.SignatureException;
 import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 
+import org.apache.log4j.Logger;
 import org.openslx.imagemaster.thrift.iface.ServerAuthenticationException;
 import org.openslx.satellitedaemon.ftp.FtpUploadWorker;
 
@@ -18,20 +19,33 @@ import org.openslx.satellitedaemon.ftp.FtpUploadWorker;
  */
 public class App
 {
-	public static void main( String[] args ) throws NoSuchAlgorithmException, KeyStoreException, CertificateException, FileNotFoundException, IOException, ServerAuthenticationException, UnrecoverableKeyException, InvalidKeyException, SignatureException
+	private static Logger log = Logger.getLogger( App.class );
+	
+	public static void main( String[] args )
+			throws NoSuchAlgorithmException, KeyStoreException, CertificateException, FileNotFoundException, IOException, ServerAuthenticationException, UnrecoverableKeyException,
+			InvalidKeyException, SignatureException
 	{
-
-//		//	TODO: A Thread that starts the call for new credentials and the upload
-//		//	whenever a new image was sceduled in the db.
-//		ImageData imDat = new ImageData( UUID.randomUUID().toString(), 113,
-//				"TestImage", System.currentTimeMillis(), System.currentTimeMillis(), "me", "anyThing",
-//				true, false, "best", "theVeryBest", 1024 );
-//		FtpCredentials ftpc = ThriftConnection.getFtpCredentials(imDat);
-//		Util.notNullFatal( ftpc, "ftpc was null" );
-//		FtpImageUploader ftpIU = new FtpImageUploader( ftpc );
-//		Util.notNullFatal( ftpIU, "ftpIU was null" );
-//		ftpIU.connectTest();
-		Thread uploadWorker = new Thread(new FtpUploadWorker());
+		try {
+			Globals.loadProperties();
+			if ( !Globals.propertiesValid() ) {
+				log.error( "Config file contains errors." );
+				System.exit( 1 );
+			}
+		} catch ( IOException e ) {
+			log.error( "Could not load config file. Quitting." );
+			System.exit( 1 );
+		}
+		//		//	TODO: A Thread that starts the call for new credentials and the upload
+		//		//	whenever a new image was sceduled in the db.
+		//		ImageData imDat = new ImageData( UUID.randomUUID().toString(), 113,
+		//				"TestImage", System.currentTimeMillis(), System.currentTimeMillis(), "me", "anyThing",
+		//				true, false, "best", "theVeryBest", 1024 );
+		//		FtpCredentials ftpc = ThriftConnection.getFtpCredentials(imDat);
+		//		Util.notNullFatal( ftpc, "ftpc was null" );
+		//		FtpImageUploader ftpIU = new FtpImageUploader( ftpc );
+		//		Util.notNullFatal( ftpIU, "ftpIU was null" );
+		//		ftpIU.connectTest();
+		Thread uploadWorker = new Thread( new FtpUploadWorker() );
 		uploadWorker.start();
 	}
 }