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
The following commit(s) were added to refs/heads/master by this push:
new 68ee955 FELIX-6476 Add support for OSGi Log 1.5 updated logger names
68ee955 is described below
commit 68ee955a2fd0cf782767d373c926ca79f389c73c
Author: Raymond Augé <[email protected]>
AuthorDate: Sun Nov 28 22:29:15 2021 -0500
FELIX-6476 Add support for OSGi Log 1.5 updated logger names
Signed-off-by: Raymond Augé <[email protected]>
---
log/src/main/java/org/apache/felix/log/Log.java | 8 ++++----
log/src/main/java/org/apache/felix/log/LogServiceImpl.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/log/src/main/java/org/apache/felix/log/Log.java
b/log/src/main/java/org/apache/felix/log/Log.java
index 1172372..8e2b59b 100644
--- a/log/src/main/java/org/apache/felix/log/Log.java
+++ b/log/src/main/java/org/apache/felix/log/Log.java
@@ -230,7 +230,7 @@ final class Log implements BundleListener,
FrameworkListener, ServiceListener
}
log(
- "Events.Framework",
+ "Events.Framework.".concat(event.getBundle().getSymbolicName()),
event.getBundle(),
null,
(eventType == FrameworkEvent.ERROR) ? LogLevel.ERROR :
LogLevel.INFO,
@@ -250,7 +250,7 @@ final class Log implements BundleListener,
FrameworkListener, ServiceListener
"BundleEvent UNRESOLVED",
"BundleEvent STARTING",
"BundleEvent STOPPING",
- "BundleEvent LAZY ACTIVATION",
+ "BundleEvent LAZY_ACTIVATION",
};
/**
@@ -274,7 +274,7 @@ final class Log implements BundleListener,
FrameworkListener, ServiceListener
if (message != null)
{
log(
- "Events.Bundle",
+ "Events.Bundle.".concat(event.getBundle().getSymbolicName()),
event.getBundle(),
null,
LogLevel.INFO,
@@ -323,7 +323,7 @@ final class Log implements BundleListener,
FrameworkListener, ServiceListener
}
log(
- "Events.Service",
+
"Events.Service.".concat(event.getServiceReference().getBundle().getSymbolicName()),
event.getServiceReference().getBundle(),
event.getServiceReference(),
(eventType == ServiceEvent.MODIFIED) ? LogLevel.DEBUG :
LogLevel.INFO,
diff --git a/log/src/main/java/org/apache/felix/log/LogServiceImpl.java
b/log/src/main/java/org/apache/felix/log/LogServiceImpl.java
index ba0467e..7a9acf3 100644
--- a/log/src/main/java/org/apache/felix/log/LogServiceImpl.java
+++ b/log/src/main/java/org/apache/felix/log/LogServiceImpl.java
@@ -97,7 +97,7 @@ final class LogServiceImpl implements LogService
final String message,
final Throwable exception)
{
- LoggerImpl logger = (LoggerImpl)m_loggerAdminImpl.getLogger(m_bundle,
"LogService", Logger.class);
+ LoggerImpl logger = (LoggerImpl)m_loggerAdminImpl.getLogger(m_bundle,
"LogService.".concat(m_bundle.getSymbolicName()), Logger.class);
switch (level) {
case LogService.LOG_DEBUG:
