You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2022/04/02 12:09:19 UTC

[sling-org-apache-sling-clam] branch master updated: add debug logging

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git


The following commit(s) were added to refs/heads/master by this push:
     new ad9147c  add debug logging
ad9147c is described below

commit ad9147cec6a2d115286bf10c5f41591e60e9fce1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Apr 2 14:09:05 2022 +0200

    add debug logging
---
 .../DefaultNodeDescendingJcrPropertyDigger.java    |  2 ++
 .../job/internal/JcrPropertyScanJobConsumer.java   | 24 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java b/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java
index 22f0675..cdf25da 100644
--- a/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java
+++ b/src/main/java/org/apache/sling/clam/jcr/internal/DefaultNodeDescendingJcrPropertyDigger.java
@@ -81,11 +81,13 @@ public final class DefaultNodeDescendingJcrPropertyDigger implements NodeDescend
 
     @SuppressWarnings({"checkstyle:CyclomaticComplexity", "checkstyle:NestedIfDepth"})
     private void digWithAbsoluteMaxDepth(@NotNull final Node node, @NotNull final Pattern pattern, @NotNull final Set<Integer> propertyTypes, final long maxLength, final int absoluteMaxDepth) throws Exception {
+        logger.debug("digging node: {}", node.getPath());
         final PropertyIterator properties = node.getProperties();
         while (properties.hasNext()) {
             final Property property = properties.nextProperty();
             final int propertyType = property.getType();
             final String path = property.getPath();
+            logger.debug("digging property: {}", path);
             if (propertyTypes.contains(propertyType) && pattern.matcher(path).matches()) {
                 if (property.isMultiple()) { // multiple property values
                     final long[] lengths = property.getLengths();
diff --git a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
index 2735630..a0ec82c 100644
--- a/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
+++ b/src/main/java/org/apache/sling/clam/job/internal/JcrPropertyScanJobConsumer.java
@@ -39,7 +39,10 @@ import org.apache.sling.event.jobs.consumer.JobConsumer;
 import org.apache.sling.event.jobs.consumer.JobExecutor;
 import org.apache.sling.serviceusermapping.ServiceUserMapped;
 import org.osgi.framework.Constants;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
 import org.osgi.service.component.annotations.ReferencePolicy;
@@ -91,9 +94,28 @@ public final class JcrPropertyScanJobConsumer implements JobConsumer {
     public JcrPropertyScanJobConsumer() { //
     }
 
+    @Activate
+    @SuppressWarnings("unused")
+    private void activate() {
+        logger.debug("activating");
+    }
+
+    @Modified
+    @SuppressWarnings("unused")
+    private void modified() {
+        logger.debug("modifying");
+    }
+
+    @Deactivate
+    @SuppressWarnings("unused")
+    private void deactivate() {
+        logger.debug("deactivating");
+    }
+
     @Override
     @SuppressWarnings("checkstyle:IllegalCatch")
     public JobResult process(final Job job) {
+        logger.debug("processing property scan job: {}", job);
         try (ResourceResolver resourceResolver = resourceResolverFactory.getServiceResourceResolver(null)) {
             final String path = job.getProperty(ClamUtil.PROPERTY_PATH, String.class);
             final String userId = job.getProperty(ClamUtil.USER_ID, String.class);
@@ -139,8 +161,10 @@ public final class JcrPropertyScanJobConsumer implements JobConsumer {
             for (final JcrPropertyScanResultHandler scanResultHandler : scanResultHandlers) {
                 try {
                     if (index == null) { // single-value property
+                        logger.debug("invoking scan result handler {} for single-value property: {}, {}, {}", scanResultHandler, path, propertyType, userId);
                         scanResultHandler.handleJcrPropertyScanResult(scanResult, path, propertyType, userId);
                     } else { // multi-value property
+                        logger.debug("invoking scan result handler {} for multi-value property: {}, {}, {}, {}", scanResultHandler, path, index, propertyType, userId);
                         scanResultHandler.handleJcrPropertyScanResult(scanResult, path, index, propertyType, userId);
                     }
                 } catch (Exception e) {