Remove some debug messages, fix possible race condition in ImageProcessor

1 files changed, 11 insertions, 2 deletions

diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index 7a6a1ad..24dfffc 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -1,9 +1,11 @@
 package org.openslx.imagemaster;
 
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.apache.thrift.transport.TTransportException;
 import org.openslx.imagemaster.serverconnection.CrcScheduler;
 import org.openslx.imagemaster.thrift.server.BinaryListener;
 import org.slf4j.LoggerFactory;
@@ -24,16 +26,23 @@ public class App
 		LoggerFactory.getLogger( "ROOT" );
 	}
 
-	public static void main( String[] args )
+	public static void main( String[] args ) throws TTransportException, NoSuchAlgorithmException
 	{
 		// Init logging
 		log.info( "Starting Application" );
 
 		// Create binary listener
 		Thread t;
-		t = new Thread( new BinaryListener(), "BinaryListener" );
+		t = new Thread( new BinaryListener( 9090, false ), "Thrift PLAIN" );
 		servers.add( t );
 		t.start();
+		try {
+			t = new Thread( new BinaryListener( 9091, true ), "Thrift TLS" );
+			servers.add( t );
+			t.start();
+		} catch ( Exception e ) {
+			log.warn( "No TLS available:", e );
+		}
 
 		// start the crc checking scheduler
 		CrcScheduler.startScheduling();