You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2017/02/21 17:03:16 UTC

svn commit: r1783910 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation: ChangeProcessor.java ObservationManagerImpl.java

Author: stefanegli
Date: Tue Feb 21 17:03:16 2017
New Revision: 1783910

URL: http://svn.apache.org/viewvc?rev=1783910&view=rev
Log:
OAK-5742 : logging more details in case stopAndWait returns false - to allow narrowing down a listener that might be hiding further behind

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java?rev=1783910&r1=1783909&r2=1783910&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ChangeProcessor.java Tue Feb 21 17:03:16 2017
@@ -631,6 +631,18 @@ class ChangeProcessor implements Filteri
                 + ", commitRateLimiter=" + commitRateLimiter
                 + ", running=" + running.isSatisfied() + "]";
     }
+    
+    /** for logging only **/
+    public String getListenerToString() {
+        if (tracker == null) {
+            return "null";
+        }
+        EventListenerMBean listenerMBean = tracker.getListenerMBean();
+        if (listenerMBean == null) {
+            return "null (no listener mbean)";
+        }
+        return listenerMBean.getToString();
+    }
 
     /**
      * Evaluate the prefilter for a given commit.

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java?rev=1783910&r1=1783909&r2=1783910&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/ObservationManagerImpl.java Tue Feb 21 17:03:16 2017
@@ -459,7 +459,10 @@ public class ObservationManagerImpl impl
                     "Timed out waiting for change processor to stop after "
                             + STOP_TIME_OUT
                             + " milliseconds. Falling back to asynchronous stop on "
-                            + processor);
+                            + processor
+                            + " (listener details: '"
+                            + processor.getListenerToString()
+                            + "')");
             processor.stop();
         }
     }