This is an automated email from the ASF dual-hosted git repository.
jsedding pushed a commit to branch testing/extra-logging
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourceresolver.git
The following commit(s) were added to refs/heads/testing/extra-logging by this
push:
new a4dc15e more debug logging
a4dc15e is described below
commit a4dc15e395f2b47ce96cdaf1488902d155a71723
Author: Julian Sedding <jsedd...@apache.org>
AuthorDate: Fri Sep 29 12:51:46 2023 +0200
more debug logging
---
.../impl/CommonResourceResolverFactoryImpl.java | 1 +
.../resourceresolver/impl/FactoryRegistrationHandler.java | 4 +++-
.../sling/resourceresolver/impl/mapping/MapEntries.java | 1 +
.../impl/FactoryRegistrationHandlerTest.java | 12 ++++++++++--
.../resourceresolver/util/events/RecordingListener.java | 2 +-
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
b/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
index d04942f..091c63b 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/CommonResourceResolverFactoryImpl.java
@@ -307,6 +307,7 @@ public class CommonResourceResolverFactoryImpl implements
MapConfigurationProvid
protected void activate(final BundleContext bundleContext) {
final Logger logger = LoggerFactory.getLogger(getClass());
try {
+ logger.info("registerService(Servlet)");
plugin = new ResourceResolverWebConsolePlugin(bundleContext, this,
this.activator.getRuntimeService());
} catch (final Throwable ignore) {
// an exception here probably means the web console plugin is not
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java
b/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java
index f0429d7..2f5d02a 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandler.java
@@ -171,7 +171,7 @@ public class FactoryRegistrationHandler implements
AutoCloseable {
private void runWithThreadName(String threadNameSuffix, Runnable task) {
final String name = Thread.currentThread().getName();
try {
-
Thread.currentThread().setName(ResourceResolverFactory.class.getSimpleName() +
" " + threadNameSuffix);
+
Thread.currentThread().setName(ResourceResolverFactory.class.getSimpleName() +
" " + threadNameSuffix + " (" + name + ")");
task.run();
} finally {
Thread.currentThread().setName(name);
@@ -195,6 +195,7 @@ public class FactoryRegistrationHandler implements
AutoCloseable {
final Dictionary<String, Object> serviceProps = new Hashtable<>();
serviceProps.put(Constants.SERVICE_VENDOR, "The Apache Software
Foundation");
serviceProps.put(Constants.SERVICE_DESCRIPTION, "Apache Sling
Resource Resolver Factory");
+ LOG.info("registerService(ResourceResolverFactory)");
factoryRegistration =
context.registerService(ResourceResolverFactory.class, new ServiceFactory<>() {
@Override
public ResourceResolverFactory getService(final Bundle bundle,
final ServiceRegistration<ResourceResolverFactory> registration) {
@@ -211,6 +212,7 @@ public class FactoryRegistrationHandler implements
AutoCloseable {
}
}, serviceProps);
+ LOG.info("registerService(RuntimeService)");
runtimeRegistration =
context.registerService(RuntimeService.class, activator.getRuntimeService(),
null);
}
diff --git
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
index 84b64fd..44c7acc 100644
---
a/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
+++
b/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
@@ -214,6 +214,7 @@ public class MapEntries implements
log.info("Registering for {}",
Arrays.toString(factory.getObservationPaths()));
this.resourceChangeQueue = Collections.synchronizedList(new
LinkedList<>());
+ log.info("registerService(ResourceChangeListener)");
return bundleContext.registerService(ResourceChangeListener.class,
this, props);
}
diff --git
a/src/test/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandlerTest.java
b/src/test/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandlerTest.java
index 04fb408..bf02d5f 100644
---
a/src/test/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandlerTest.java
+++
b/src/test/java/org/apache/sling/resourceresolver/impl/FactoryRegistrationHandlerTest.java
@@ -25,7 +25,8 @@ import
org.apache.sling.resourceresolver.impl.providers.ResourceProviderTracker;
import org.apache.sling.resourceresolver.util.events.RecordingListener;
import
org.apache.sling.resourceresolver.util.events.ServiceEventUtil.ServiceEventDTO;
import org.apache.sling.serviceusermapping.ServiceUserMapper;
-import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
+import org.apache.sling.testing.mock.osgi.junit5.OsgiContext;
+import org.apache.sling.testing.mock.osgi.junit5.OsgiContextBuilder;
import org.apache.sling.testing.mock.osgi.junit5.OsgiContextExtension;
import org.hamcrest.Matcher;
import org.jetbrains.annotations.NotNull;
@@ -35,6 +36,8 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mockito;
import org.mockito.internal.stubbing.defaultanswers.ReturnsSmartNulls;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.sling.resourceresolver.util.CustomMatchers.allOf;
import static org.apache.sling.resourceresolver.util.CustomMatchers.hasItem;
@@ -51,6 +54,8 @@ import static org.mockito.Mockito.when;
@ExtendWith(OsgiContextExtension.class)
class FactoryRegistrationHandlerTest {
+ private static final Logger LOG =
LoggerFactory.getLogger(FactoryRegistrationHandlerTest.class);
+
private static final int DEFAULT_TEST_ITERATIONS = 20;
private static final @NotNull Matcher<Iterable<? extends ServiceEventDTO>>
RRF_REGISTRATION = allOf(
@@ -69,7 +74,10 @@ class FactoryRegistrationHandlerTest {
hasItem(registration(ResourceResolverFactory.class))
);
- OsgiContext osgi = new OsgiContext();
+ OsgiContext osgi = new OsgiContextBuilder()
+ .afterSetUp(context -> LOG.info("--- INITIALIZING OSGiContext {}",
context))
+ .beforeTearDown(context -> LOG.info("--- TEARING DOWN OSGiContext
{}", context))
+ .build();
private ResourceResolverFactoryActivator activator;
diff --git
a/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
b/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
index 1751909..2d8ff33 100644
---
a/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
+++
b/src/test/java/org/apache/sling/resourceresolver/util/events/RecordingListener.java
@@ -100,6 +100,6 @@ public class RecordingListener extends
AbstractAwaitingListener {
stopListening();
}
- assertThat("Expected ServiceEvents", serviceEvents,
serviceEventDTOMatcher);
+ assertThat("Expected ServiceEvents " + this, serviceEvents,
serviceEventDTOMatcher);
}
}
