- output a warning instead of an exception if the properties file .configure can not be found
git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@207 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c
This commit is contained in:
@@ -18,6 +18,9 @@ public class LogUtil {
|
|||||||
|
|
||||||
private static final String PLUGIN_ID = "ch.ntb.usb";
|
private static final String PLUGIN_ID = "ch.ntb.usb";
|
||||||
private static final String PROPERTIES_FILE = ".configure";
|
private static final String PROPERTIES_FILE = ".configure";
|
||||||
|
private static final String LOGGER_WARNING = "Warning in class "
|
||||||
|
+ LogUtil.class.getName()
|
||||||
|
+ ": could not load the logger properties file " + PROPERTIES_FILE;
|
||||||
|
|
||||||
private static boolean debugEnabled;
|
private static boolean debugEnabled;
|
||||||
|
|
||||||
@@ -62,37 +65,40 @@ public class LogUtil {
|
|||||||
try {
|
try {
|
||||||
InputStream is = LogUtil.class.getClassLoader()
|
InputStream is = LogUtil.class.getClassLoader()
|
||||||
.getResourceAsStream(PROPERTIES_FILE);
|
.getResourceAsStream(PROPERTIES_FILE);
|
||||||
// FileInputStream fis = new FileInputStream();
|
if (is == null) {
|
||||||
Properties prop = new Properties();
|
System.err.println(LOGGER_WARNING);
|
||||||
prop.load(is);
|
} else {
|
||||||
// get global debug enable flag
|
Properties prop = new Properties();
|
||||||
debugEnabled = Boolean.parseBoolean(prop.getProperty(PLUGIN_ID
|
prop.load(is);
|
||||||
+ "/debug"));
|
// get global debug enable flag
|
||||||
// get and configure loggers
|
debugEnabled = Boolean.parseBoolean(prop.getProperty(PLUGIN_ID
|
||||||
boolean moreLoggers = true;
|
+ "/debug"));
|
||||||
int loggerCount = 0;
|
// get and configure loggers
|
||||||
while (moreLoggers) {
|
boolean moreLoggers = true;
|
||||||
String loggerProp = prop.getProperty(PLUGIN_ID
|
int loggerCount = 0;
|
||||||
+ "/debug/logger" + loggerCount);
|
while (moreLoggers) {
|
||||||
loggerCount++;
|
String loggerProp = prop.getProperty(PLUGIN_ID
|
||||||
if (loggerProp != null) {
|
+ "/debug/logger" + loggerCount);
|
||||||
// parse string and get logger name and log level
|
loggerCount++;
|
||||||
int slashIndex = loggerProp.indexOf('/');
|
if (loggerProp != null) {
|
||||||
String loggerName = loggerProp.substring(0, slashIndex)
|
// parse string and get logger name and log level
|
||||||
.trim();
|
int slashIndex = loggerProp.indexOf('/');
|
||||||
String logLevel = loggerProp.substring(slashIndex + 1,
|
String loggerName = loggerProp.substring(0, slashIndex)
|
||||||
loggerProp.length());
|
.trim();
|
||||||
// register logger
|
String logLevel = loggerProp.substring(slashIndex + 1,
|
||||||
Level level;
|
loggerProp.length());
|
||||||
if (debugEnabled) {
|
// register logger
|
||||||
level = Level.parse(logLevel);
|
Level level;
|
||||||
|
if (debugEnabled) {
|
||||||
|
level = Level.parse(logLevel);
|
||||||
|
} else {
|
||||||
|
level = Level.OFF;
|
||||||
|
}
|
||||||
|
Logger logger = getLogger(loggerName);
|
||||||
|
initLevel(logger, level);
|
||||||
} else {
|
} else {
|
||||||
level = Level.OFF;
|
moreLoggers = false;
|
||||||
}
|
}
|
||||||
Logger logger = getLogger(loggerName);
|
|
||||||
initLevel(logger, level);
|
|
||||||
} else {
|
|
||||||
moreLoggers = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
Reference in New Issue
Block a user