Merge remote-tracking branch 'mimesis/noLog4jDefaultConf_param' into …

…sigar-1.6
huhongbo · Jul 18, 2011 · 012dcef · 012dcef
2 parents f21897f + 0a3f546
commit 012dcef
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/bindings/java/src/org/hyperic/sigar/SigarLog.java b/bindings/java/src/org/hyperic/sigar/SigarLog.java
@@ -29,6 +29,8 @@ public class SigarLog {
     private static final int LOG_INFO   = 3;
     private static final int LOG_DEBUG  = 4;
 
+    private static final boolean enableLogFallbackConf = ! Boolean.getBoolean("sigar.noLog4jDefaultConfig");
+
     private static native void setLogger(Sigar sigar, Logger log);
 
     public static native void setLevel(Sigar sigar, int level);
@@ -46,7 +48,7 @@ private static Logger getLogger() {
 
     public static Logger getLogger(String name) {
         Logger log = Logger.getLogger(name);
-        if (!isLogConfigured()) {
+        if (enableLogFallbackConf && !isLogConfigured()) {
             BasicConfigurator.configure();
         }
         return log;