[client] Run proxy configurator asynchroneously

1 files changed, 21 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index 6666d747..b4814e5a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -22,6 +22,8 @@ public class App {
 	// Logger
 	private final static Logger LOGGER = Logger.getLogger(App.class);
 
+	private static Thread proxyThread = null;
+
 	private static void setupLogger() {
 
 		// path to the log file
@@ -74,11 +76,8 @@ public class App {
 				String s = event.getRenderedMessage();
 				if (s.contains("uthorization")) {
 					Matcher m = re.matcher(s);
-					if (!m.find()) {
-						LOGGER.warn("Could not match pattern!");
-					} else {
+					if (m.find()) {
 						s = m.replaceAll("Authorization: ***********");
-						LOGGER.info("Patched log message");
 					}
 				}
 				ffa.append(new LoggingEvent(event.getFQNOfLoggerClass(), event.getLogger(),
@@ -104,11 +103,13 @@ public class App {
 		setupLogger();
 
 		// Initialize the proxy settings
-		try {
-			ProxyConfigurator.init();
-		} catch (IOException e) {
-			showAwtMessage("Could not detect proxy server automatically. No proxy server will be used", e);
-		}
+		proxyThread = new Thread() {
+			@Override
+			public void run() {
+				ProxyConfigurator.init();
+			}
+		};
+		proxyThread.start();
 
 		// Check if we can load SWT by calling some library function
 		try {
@@ -121,7 +122,7 @@ public class App {
 		// setup global thrift connection error handler before anything else
 		// Set master server to use (TODO: make configurable via command line)
 		ThriftManager.setMasterServerAddress("bwlp-masterserver.ruf.uni-freiburg.de");
-		
+
 		MainWindow.open();
 
 		// start the main window
@@ -135,4 +136,14 @@ public class App {
 		}
 		new AwtBox(null, message);
 	}
+
+	public static synchronized void waitForInit() {
+			if (proxyThread == null)
+				return;
+			try {
+				proxyThread.join();
+			} catch (InterruptedException e) {
+			}
+			proxyThread = null;
+	}
 }