Modified logger so that log level is obeyed whether a log service is
used or not.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@487260 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/src/main/java/org/apache/felix/framework/Logger.java b/framework/src/main/java/org/apache/felix/framework/Logger.java
index 55baf22..31ae57d 100644
--- a/framework/src/main/java/org/apache/felix/framework/Logger.java
+++ b/framework/src/main/java/org/apache/felix/framework/Logger.java
@@ -106,26 +106,23 @@
// more conservative locking here, but let's be optimistic.
Object[] logger = m_logger;
- if (logger != null)
+ if (m_logLevel >= level)
{
- _logReflectively(logger, sr, level, msg, throwable);
- }
- else
- {
- String s = (sr == null) ? null : "SvcRef " + sr;
- s = (s == null) ? msg : s + " " + msg;
- s = (throwable == null) ? s : s + " (" + throwable + ")";
- switch (level)
+ if (logger != null)
{
- case LOG_DEBUG:
- if (m_logLevel >= LOG_DEBUG)
- {
+ _logReflectively(logger, sr, level, msg, throwable);
+ }
+ else
+ {
+ String s = (sr == null) ? null : "SvcRef " + sr;
+ s = (s == null) ? msg : s + " " + msg;
+ s = (throwable == null) ? s : s + " (" + throwable + ")";
+ switch (level)
+ {
+ case LOG_DEBUG:
System.out.println("DEBUG: " + s);
- }
- break;
- case LOG_ERROR:
- if (m_logLevel >= LOG_ERROR)
- {
+ break;
+ case LOG_ERROR:
System.out.println("ERROR: " + s);
if (throwable != null)
{
@@ -136,22 +133,16 @@
}
throwable.printStackTrace();
}
- }
- break;
- case LOG_INFO:
- if (m_logLevel >= LOG_INFO)
- {
+ break;
+ case LOG_INFO:
System.out.println("INFO: " + s);
- }
- break;
- case LOG_WARNING:
- if (m_logLevel >= LOG_WARNING)
- {
+ break;
+ case LOG_WARNING:
System.out.println("WARNING: " + s);
- }
- break;
- default:
- System.out.println("UNKNOWN[" + level + "]: " + s);
+ break;
+ default:
+ System.out.println("UNKNOWN[" + level + "]: " + s);
+ }
}
}
}