You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/11/05 21:01:22 UTC
svn commit: r1539115 -
/karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogServiceImpl.java
Author: jbonofre
Date: Tue Nov 5 20:01:21 2013
New Revision: 1539115
URL: http://svn.apache.org/r1539115
Log:
[KARAF-2473] Reintroduce DEFAULT log level
Modified:
karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogServiceImpl.java
Modified: karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogServiceImpl.java
URL: http://svn.apache.org/viewvc/karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogServiceImpl.java?rev=1539115&r1=1539114&r2=1539115&view=diff
==============================================================================
--- karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogServiceImpl.java (original)
+++ karaf/trunk/log/core/src/main/java/org/apache/karaf/log/core/internal/LogServiceImpl.java Tue Nov 5 20:01:21 2013
@@ -90,17 +90,15 @@ public class LogServiceImpl implements L
if (ROOT_LOGGER.equalsIgnoreCase(logger)) {
logger = null;
}
-
+
if (logLevel == Level.DEFAULT && logger == null) {
throw new RuntimeException("Can not unset the ROOT logger");
}
Configuration cfg = getConfiguration();
- @SuppressWarnings("rawtypes")
Dictionary props = cfg.getProperties();
-
- String level = logLevel.toString();
+ String level = logLevel.toString();
String val;
String prop;
if (logger == null) {
@@ -108,8 +106,9 @@ public class LogServiceImpl implements L
} else {
prop = LOGGER_PREFIX + logger;
}
+
val = (String) props.get(prop);
- if (level.equals("DEFAULT")) {
+ if (Level.isDefault(level)) {
if (val != null) {
val = val.trim();
int idx = val.indexOf(",");