This is an automated email from the ASF dual-hosted git repository. tmaret pushed a commit to branch SLING-9465-dynamic-reference in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit 4531d1c7691b566e092efab5c7b2b19f05d56f0f Author: tmaret <[email protected]> AuthorDate: Sat May 23 22:52:19 2020 +0200 SLING-9465 - DiscoveryService is activated on all services * Register DistributionPublisherConfigured marker service when at least one DistributionPublisher configuration exists * Reference (dynamic) the DistributionPublisherConfigured service from services that are only required with DistributionPublisher --- .../journal/impl/publisher/DiscoveryService.java | 10 +++-- .../shared/DistributionPublisherConfigured.java | 47 ++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java index 2e0b665..1175c31 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/DiscoveryService.java @@ -22,6 +22,7 @@ import static java.lang.String.format; import static org.apache.sling.distribution.journal.HandlerAdapter.create; import static org.apache.sling.commons.scheduler.Scheduler.PROPERTY_SCHEDULER_CONCURRENT; import static org.apache.sling.commons.scheduler.Scheduler.PROPERTY_SCHEDULER_PERIOD; +import static org.osgi.service.component.annotations.ReferencePolicy.DYNAMIC; import java.io.Closeable; import java.util.Dictionary; @@ -30,6 +31,7 @@ import java.util.Hashtable; import javax.annotation.ParametersAreNonnullByDefault; import org.apache.sling.distribution.journal.impl.queue.impl.PubQueueCacheService; +import org.apache.sling.distribution.journal.impl.shared.DistributionPublisherConfigured; import org.apache.sling.distribution.journal.impl.shared.Topics; import org.apache.sling.distribution.journal.messages.Messages; import org.apache.sling.distribution.journal.messages.Messages.SubscriberConfiguration; @@ -55,8 +57,7 @@ import org.slf4j.LoggerFactory; * Listens for discovery messages and tracks presence of Subscribers as well as * the last processed offset of each Subscriber * - * This component uses lazy starting so it is only started when there is at least one Agent - * that requires it. + * This component is only started when there is at least one DistributionSubscriber agent configured. * * This component is meant to be shared by Publisher agents. */ @@ -70,7 +71,10 @@ public class DiscoveryService implements Runnable { @Reference private JournalAvailable journalAvailable; - + + @Reference(policy = DYNAMIC) + private volatile DistributionPublisherConfigured distributionPublisherConfigured; + @Reference private MessagingProvider messagingProvider; diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/shared/DistributionPublisherConfigured.java b/src/main/java/org/apache/sling/distribution/journal/impl/shared/DistributionPublisherConfigured.java new file mode 100644 index 0000000..67da406 --- /dev/null +++ b/src/main/java/org/apache/sling/distribution/journal/impl/shared/DistributionPublisherConfigured.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.sling.distribution.journal.impl.shared; + +import org.osgi.service.component.annotations.Activate; +import org.osgi.service.component.annotations.Component; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.osgi.service.component.annotations.ConfigurationPolicy.REQUIRE; + +@Component( + immediate = true, + service = DistributionPublisherConfigured.class, + configurationPolicy = REQUIRE, + configurationPid = "org.apache.sling.distribution.journal.impl.publisher.DistributionPublisherFactory" +) +public class DistributionPublisherConfigured { + + private static final Logger LOG = LoggerFactory.getLogger(DistributionPublisherConfigured.class); + + @Activate + public void activate() { + LOG.info("activated"); + } + + @Activate + public void deactivate() { + LOG.info("deactivated"); + } +}
