You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ro...@apache.org on 2021/11/29 03:51:12 UTC
[felix-dev] 02/05: FELIX-6477 Add support for OSGi Log 1.5 updated logger names
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
commit 32dd30838b3b352f285b64d3dc4ee3a7aebc7daf
Author: Raymond Augé <ra...@liferay.com>
AuthorDate: Sat Nov 27 23:16:44 2021 -0500
FELIX-6477 Add support for OSGi Log 1.5 updated logger names
Signed-off-by: Raymond Augé <ra...@liferay.com>
---
.../org/apache/felix/logback/internal/LogbackLogListener.java | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java b/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java
index cca075d..179f81e 100644
--- a/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java
+++ b/logback/logback/src/main/java/org/apache/felix/logback/internal/LogbackLogListener.java
@@ -83,12 +83,23 @@ public class LogbackLogListener implements LogListener, LoggerContextListener {
loggerName = formatBundle(entry.getBundle(), loggerName);
avoidCallerData.set(true);
}
+ else if (loggerName.startsWith(EVENTS_BUNDLE) ||
+ loggerName.startsWith(EVENTS_FRAMEWORK) ||
+ loggerName.startsWith(LOG_SERVICE)) {
+
+ avoidCallerData.set(true);
+ }
else if (EVENTS_SERVICE.equals(loggerName)) {
loggerName = formatBundle(entry.getBundle(), loggerName);
message = message + " {}";
arguments = new Object[] {entry.getServiceReference()};
avoidCallerData.set(true);
}
+ else if (loggerName.startsWith(EVENTS_SERVICE)) {
+ message = message + " {}";
+ arguments = new Object[] {entry.getServiceReference()};
+ avoidCallerData.set(true);
+ }
Logger logger = loggerContext.getLogger(loggerName);