You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2022/07/25 05:29:38 UTC
[felix-dev] branch master updated: FELIX-6551 | OSGi event blocklisting is not informative (#168)
This is an automated email from the ASF dual-hosted git repository.
cziegeler 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 372a05a6ac FELIX-6551 | OSGi event blocklisting is not informative (#168)
372a05a6ac is described below
commit 372a05a6ac3824483e46f8b1ebce2f5a2fcadb95
Author: akankshajain18 <cs...@gmail.com>
AuthorDate: Mon Jul 25 10:59:32 2022 +0530
FELIX-6551 | OSGi event blocklisting is not informative (#168)
* FELIX-6551 | OSGi event blocklisting is not informative
* FELIX-6551 | improved logging
* FELIX-6551 | improved logging
* incorporated review changes
---
.../felix/eventadmin/impl/handler/EventHandlerProxy.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java
index 30a1d795c6..a62411f58b 100644
--- a/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java
+++ b/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/handler/EventHandlerProxy.java
@@ -449,10 +449,14 @@ public class EventHandlerProxy {
{
if(!this.denied)
{
- LogWrapper.getLogger().log(
- LogWrapper.LOG_WARNING,
- "Denying event handler from ServiceReference [" + this.reference + " | Bundle("
- + this.reference.getBundle() + ")] due to timeout!");
+ String output = this.reference + " | Bundle(" + this.reference.getBundle() + ")";
+ if(this.handler != null){
+ output += " | Handler(" + this.handler.getClass().getCanonicalName() + ")";
+ }
+
+ LogWrapper.getLogger().log(
+ LogWrapper.LOG_ERROR,
+ String.format("Denying event handler from ServiceReference [%s] due to timeout!", output));
this.denied = true;
// we can free the handler now.
this.release();