This is an automated email from the ASF dual-hosted git repository. cschneider pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-journal.git
commit f4764ac482aa2fd99541eef737d2bc102a809099 Author: Christian Schneider <[email protected]> AuthorDate: Wed Nov 25 12:12:43 2020 +0100 SKYOPS-9772 - Makes sure events and messages are sent event when there is an exception --- .../impl/publisher/PackageDistributedNotifier.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageDistributedNotifier.java b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageDistributedNotifier.java index d92343b..07eee83 100644 --- a/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageDistributedNotifier.java +++ b/src/main/java/org/apache/sling/distribution/journal/impl/publisher/PackageDistributedNotifier.java @@ -108,8 +108,12 @@ public class PackageDistributedNotifier implements TopologyChangeHandler { } private void sendMsg(String pubAgentName, DistributionQueueItem queueItem) { - PackageDistributedMessage msg = createDistributedMessage(pubAgentName, queueItem); - sender.accept(msg); + try { + PackageDistributedMessage msg = createDistributedMessage(pubAgentName, queueItem); + sender.accept(msg); + } catch (Exception e) { + LOG.warn("Exception when sending package distributed message for pub agent {} queue item {}", pubAgentName, queueItem.getPackageId(), e); + } } private PackageDistributedMessage createDistributedMessage(String pubAgentName, DistributionQueueItem queueItem) { @@ -123,7 +127,11 @@ public class PackageDistributedNotifier implements TopologyChangeHandler { } private void sendEvt(String pubAgentName, DistributionQueueItem queueItem) { - Event distributed = DistributionEvent.eventPackageDistributed(queueItem, pubAgentName); - eventAdmin.sendEvent(distributed); + try { + Event distributed = DistributionEvent.eventPackageDistributed(queueItem, pubAgentName); + eventAdmin.sendEvent(distributed); + } catch (Exception e) { + LOG.warn("Exception when sending package distributed event for pub agent {} queue item {}", pubAgentName, queueItem.getPackageId(), e); + } } }
