You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cs...@apache.org on 2019/07/02 10:35:58 UTC
[sling-org-apache-sling-distribution-journal-messages] 02/02:
SLING-8533 - Add ExceptionEventSender
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-messages.git
commit ee3332ca61e5e6420330fa210a8574408b7025d1
Author: Christian Schneider <cs...@adobe.com>
AuthorDate: Tue Jul 2 12:32:18 2019 +0200
SLING-8533 - Add ExceptionEventSender
---
pom.xml | 6 +++
.../distribution/journal/ExceptionEventSender.java | 55 ++++++++++++++++++++++
.../sling/distribution/journal/package-info.java | 2 +-
3 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b5651c8..dfd6ad6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,12 @@
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>osgi.annotation</artifactId>
<version>7.0.0</version>
<scope>provided</scope>
diff --git a/src/main/java/org/apache/sling/distribution/journal/ExceptionEventSender.java b/src/main/java/org/apache/sling/distribution/journal/ExceptionEventSender.java
new file mode 100644
index 0000000..f83b4d6
--- /dev/null
+++ b/src/main/java/org/apache/sling/distribution/journal/ExceptionEventSender.java
@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventAdmin;
+
+/**
+ * This is used by the journal adapter to send events for exceptions that happen
+ * when distribution talks to the journal.
+ */
+public class ExceptionEventSender {
+
+ public static final String ERROR_TOPIC = "org/apache/sling/distribution/journal/errors";
+ private final EventAdmin eventAdmin;
+
+ public ExceptionEventSender(@Nullable EventAdmin eventAdmin) {
+ this.eventAdmin = eventAdmin;
+ }
+
+ private Event createErrorEvent(Exception e) {
+ Map<String, String> props = new HashMap<>();
+ props.put("type", e.getClass().getName());
+ props.put("message", e.getMessage());
+ return new Event(ERROR_TOPIC, props);
+ }
+
+ public void send(Exception e) {
+ if (eventAdmin != null) {
+ Event event = createErrorEvent(e);
+ eventAdmin.postEvent(event);
+ }
+ }
+}
diff --git a/src/main/java/org/apache/sling/distribution/journal/package-info.java b/src/main/java/org/apache/sling/distribution/journal/package-info.java
index 82ea548..39709b3 100644
--- a/src/main/java/org/apache/sling/distribution/journal/package-info.java
+++ b/src/main/java/org/apache/sling/distribution/journal/package-info.java
@@ -16,6 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-@org.osgi.annotation.versioning.Version("0.0.1")
+@org.osgi.annotation.versioning.Version("0.1.0")
package org.apache.sling.distribution.journal;