From cdeb8c2768171c1558cb1ac3ba499855a567c2e8 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Mon, 1 Dec 2014 17:18:54 +0100
Subject: [client] log4j backend for proxy_vole

fixes the proxy stuff not beeing logged correctly
---
 dozentenmodul/src/main/java/App.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'dozentenmodul/src/main/java/App.java')

diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java
index c7d25c43..2d6be271 100644
--- a/dozentenmodul/src/main/java/App.java
+++ b/dozentenmodul/src/main/java/App.java
@@ -3,9 +3,6 @@ import gui.intro.Login_GUI;
 import java.awt.EventQueue;
 import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Proxy;
-import java.net.ProxySelector;
-import java.net.URI;
 
 import javax.swing.JOptionPane;
 
@@ -13,14 +10,7 @@ import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.FileAppender;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
-import org.openslx.network.ProxyConfiguration;
 
-import com.btr.proxy.search.ProxySearch;
-import com.btr.proxy.search.ProxySearch.Strategy;
-import com.btr.proxy.search.wpad.WpadProxySearchStrategy;
-import com.btr.proxy.util.ProxyException;
-
-import util.ShibbolethECP;
 import config.Config;
 import config.ConfigProxy;
 
@@ -54,7 +44,6 @@ public class App {
 			fa = new FileAppender(new PatternLayout("%d [%F:%M] %m%n"), logFilePath);
 			// All classes should log to file, configure global file appender.
 			BasicConfigurator.configure(fa);
-//			LOGGER.addAppender(fa);
 			LOGGER.info("Starting logging to: " + logFilePath);
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -74,6 +63,8 @@ public class App {
 			return;
 		}
 
+		setupLogger();
+
 		// initialise the proxy settings
 		try {
 			ConfigProxy.init();
@@ -81,8 +72,6 @@ public class App {
 			LOGGER.error("IOException when trying to initialise the proxy, see trace: ", e);
 		}
 
-		setupLogger();
-
 		// start the GUI
 		EventQueue.invokeLater(new Runnable() {
 			public void run() {
-- 
cgit v1.2.3-55-g7522