svn commit: r612907 - in /incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl: AbstractRepositoryEventHandler.java DistributingEventHandler.java JobEventHandler.java

[cziegeler]

Author: cziegeler
Date: Thu Jan 17 10:17:48 2008
New Revision: 612907

URL: http://svn.apache.org/viewvc?rev=612907&view=rev
Log:
More debug logging improvements.

Modified:
    
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java
    
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
    
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java

Modified: 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java?rev=612907&r1=612906&r2=612907&view=diff
==============================================================================
--- 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java
 (original)
+++ 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java
 Thu Jan 17 10:17:48 2008
@@ -127,9 +127,6 @@
      */
     public void run() {
         if ( this.cleanupPeriod > 0 ) {
-            if ( this.logger.isDebugEnabled() ) {
-                this.logger.debug("Cleaning up repository, removing everything 
older than {} minutes.", this.cleanupPeriod);
-            }
             this.cleanUpRepository();
         }
     }

Modified: 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java?rev=612907&r1=612906&r2=612907&view=diff
==============================================================================
--- 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
 (original)
+++ 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/DistributingEventHandler.java
 Thu Jan 17 10:17:48 2008
@@ -47,6 +47,8 @@
      * @see 
org.apache.sling.event.impl.AbstractRepositoryEventHandler#cleanUpRepository()
      */
     protected void cleanUpRepository() {
+        this.logger.debug("Cleaning up repository, removing all events older 
than {} minutes.", this.cleanupPeriod);
+
         // we create an own session for concurrency issues
         Session s = null;
         try {

Modified: 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
URL: 
http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=612907&r1=612906&r2=612907&view=diff
==============================================================================
--- 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
 (original)
+++ 
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java
 Thu Jan 17 10:17:48 2008
@@ -82,6 +82,8 @@
      * Clean up the repository.
      */
     protected void cleanUpRepository() {
+        this.logger.debug("Cleaning up repository, removing all jobs older 
than {} minutes.", this.cleanupPeriod);
+
         // we create an own session for concurrency issues
         Session s = null;
         try {
@@ -108,11 +110,14 @@
 
                     final Query q = qManager.createQuery(buffer.toString(), 
Query.XPATH);
                     final NodeIterator iter = q.execute().getNodes();
+                    int count = 0;
                     while ( iter.hasNext() ) {
                         final Node eventNode = iter.nextNode();
                         eventNode.remove();
+                        count++;
                     }
                     parentNode.save();
+                    logger.debug("Removed {} job nodes from the repository.", 
count);
                     return null;
                 }
             }.with(parentNode, false);