Merge remote-tracking branch 'mimesis/noLog4jDefaultConf_param' into sigar-1.6

This commit is contained in:
Doug MacEachern 2011-07-18 10:14:48 -07:00
commit 012dcef75d
1 changed files with 3 additions and 1 deletions

View File

@ -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 @@ public class SigarLog {
public static Logger getLogger(String name) {
Logger log = Logger.getLogger(name);
if (!isLogConfigured()) {
if (enableLogFallbackConf && !isLogConfigured()) {
BasicConfigurator.configure();
}
return log;