adamfisk#133 Removed log4j.xml from jar

enmuser · Feb 4, 2014 · fff6d2f · fff6d2f
1 parent 8072164
commit fff6d2f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 48 deletions.
diff --git a/src/main/java/org/littleshoot/proxy/Launcher.java b/src/main/java/org/littleshoot/proxy/Launcher.java
@@ -12,6 +12,7 @@
 import org.apache.commons.cli.UnrecognizedOptionException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.PropertyConfigurator;
+import org.apache.log4j.xml.DOMConfigurator;
 import org.littleshoot.proxy.extras.SelfSignedMitmManager;
 import org.littleshoot.proxy.impl.DefaultHttpProxyServer;
 import org.littleshoot.proxy.impl.ProxyUtils;
@@ -125,9 +126,9 @@ private static void printHelp(final Options options,
 
     private static void pollLog4JConfigurationFileIfAvailable() {
         File log4jConfigurationFile = new File(
-                "src/main/resources/log4j.properties");
+                "src/test/resources/log4j.xml");
         if (log4jConfigurationFile.exists()) {
-            PropertyConfigurator.configureAndWatch(
+            DOMConfigurator.configureAndWatch(
                     log4jConfigurationFile.getAbsolutePath(), 15);
         }
     }

diff --git a/src/main/java/org/littleshoot/proxy/impl/ProxyUtils.java b/src/main/java/org/littleshoot/proxy/impl/ProxyUtils.java
@@ -302,12 +302,16 @@ public static boolean extractBooleanDefaultTrue(final Properties props,
     }
 
     public static int extractInt(final Properties props, final String key) {
+        return extractInt(props, key, -1);
+    }
+
+    public static int extractInt(final Properties props, final String key, int defaultValue) {
         final String readThrottleString = props.getProperty(key);
         if (StringUtils.isNotBlank(readThrottleString) &&
             NumberUtils.isNumber(readThrottleString)) {
             return Integer.parseInt(readThrottleString);
         }
-        return -1;
+        return defaultValue;
     }
 
     public static boolean isCONNECT(HttpObject httpObject) {

diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml