1 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/org/openslx/imagemaster/App.java b/src/main/java/org/openslx/imagemaster/App.java
index 24dfffc..6c834b0 100644
--- a/src/main/java/org/openslx/imagemaster/App.java
+++ b/src/main/java/org/openslx/imagemaster/App.java
@@ -1,12 +1,14 @@
 package org.openslx.imagemaster;
 
+import java.net.InetAddress;
+import java.net.SocketException;
 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.localrpc.NetworkHandler;
 import org.openslx.imagemaster.thrift.server.BinaryListener;
 import org.slf4j.LoggerFactory;
 
@@ -26,7 +28,7 @@ public class App
 		LoggerFactory.getLogger( "ROOT" );
 	}
 
-	public static void main( String[] args ) throws TTransportException, NoSuchAlgorithmException
+	public static void main( String[] args ) throws TTransportException, NoSuchAlgorithmException, SocketException
 	{
 		// Init logging
 		log.info( "Starting Application" );
@@ -36,6 +38,13 @@ public class App
 		t = new Thread( new BinaryListener( 9090, false ), "Thrift PLAIN" );
 		servers.add( t );
 		t.start();
+
+		// Create UDP RPC local interface
+		t = new Thread( new NetworkHandler( 1333, InetAddress.getLoopbackAddress() ) );
+		servers.add( t );
+		t.start();
+
+		// Create SSL binary listener
 		try {
 			t = new Thread( new BinaryListener( 9091, true ), "Thrift TLS" );
 			servers.add( t );
@@ -44,9 +53,6 @@ public class App
 			log.warn( "No TLS available:", e );
 		}
 
-		// start the crc checking scheduler
-		CrcScheduler.startScheduling();
-
 		// Run more servers
 		// ...
 		// Wait for all servers to die
@@ -57,7 +63,8 @@ public class App
 					wait.join();
 					success = true;
 				} catch ( InterruptedException e ) {
-					// Do nothing...
+					if ( wait.isInterrupted() || !wait.isAlive() )
+						break;
 				}
 			}
 		}