summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/config/ConfigProxy.java
diff options
context:
space:
mode:
authorJonathan Bauer2014-12-01 17:18:54 +0100
committerJonathan Bauer2014-12-01 17:18:54 +0100
commitcdeb8c2768171c1558cb1ac3ba499855a567c2e8 (patch)
tree189bb3b287b0590be7a40970af884763e7247e50 /dozentenmodul/src/main/java/config/ConfigProxy.java
parentMerge branch 'master' of git.openslx.org:openslx-ng/tutor-module (diff)
downloadtutor-module-cdeb8c2768171c1558cb1ac3ba499855a567c2e8.tar.gz
tutor-module-cdeb8c2768171c1558cb1ac3ba499855a567c2e8.tar.xz
tutor-module-cdeb8c2768171c1558cb1ac3ba499855a567c2e8.zip
[client] log4j backend for proxy_vole
fixes the proxy stuff not beeing logged correctly
Diffstat (limited to 'dozentenmodul/src/main/java/config/ConfigProxy.java')
-rw-r--r--dozentenmodul/src/main/java/config/ConfigProxy.java36
1 files changed, 34 insertions, 2 deletions
diff --git a/dozentenmodul/src/main/java/config/ConfigProxy.java b/dozentenmodul/src/main/java/config/ConfigProxy.java
index c545c4b4..a97368d6 100644
--- a/dozentenmodul/src/main/java/config/ConfigProxy.java
+++ b/dozentenmodul/src/main/java/config/ConfigProxy.java
@@ -1,14 +1,18 @@
package config;
-
import java.io.IOException;
import java.net.ProxySelector;
+import java.text.MessageFormat;
+import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.apache.log4j.Priority;
import com.btr.proxy.search.ProxySearch;
import com.btr.proxy.search.wpad.WpadProxySearchStrategy;
import com.btr.proxy.util.ProxyException;
+import com.btr.proxy.util.Logger.LogBackEnd;
+import com.btr.proxy.util.Logger.LogLevel;
/**
* Configures the proxy
@@ -27,10 +31,38 @@ public class ConfigProxy {
* Initialization method.
*/
public static void init() throws IOException {
+ // first setup the logger of proxy_vole
+ com.btr.proxy.util.Logger.setBackend(new LogBackEnd() {
+
+ @SuppressWarnings("deprecation")
+ public void log(Class<?> clazz, LogLevel loglevel, String msg,
+ Object... params) {
+ Priority priority;
+ switch (loglevel) {
+ case ERROR:
+ priority = Level.ERROR;
+ break;
+ case WARNING:
+ priority = Priority.WARN;
+ break;
+ case INFO:
+ priority = Priority.INFO;
+ break;
+ default:
+ priority = Priority.DEBUG;
+ }
+ Logger.getLogger(clazz).log(priority, MessageFormat.format(msg, params));
+ }
+
+ public boolean isLogginEnabled(LogLevel logLevel) {
+ return true;
+ }
+ });
+
// try to find local proxy settings
ProxySearch proxySearch = ProxySearch.getDefaultProxySearch();
ProxySelector myProxySelector = proxySearch.getProxySelector();
-
+
if (myProxySelector == null) {
// didn't work, try WPAD detection
LOGGER.error("No suitable proxy settings found, trying WPAD...");