Merge branch 'sigar-1.6'
This commit is contained in:
commit
edf041dc7a
5 files changed
+94
-7
No files matched your search
@@ -31,7 +31,7 @@ public class ProcUtil {
|
||||
|
||||
for (int i=0; i<len; i++) {
|
||||
char c = name.charAt(i);
|
||||
if (!((c == '.') || Character.isLetter(c))) {
|
||||
if (!((c == '.') || Character.isJavaIdentifierPart(c))) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user