You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2016/07/04 13:33:57 UTC
[1/2] karaf-decanter git commit: [KARAF-4605] Use different topic for
event admin
Repository: karaf-decanter
Updated Branches:
refs/heads/master bfe15529e -> 61bd1c36b
[KARAF-4605] Use different topic for event admin
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/61bd1c36
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/61bd1c36
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/61bd1c36
Branch: refs/heads/master
Commit: 61bd1c36b3c15b7698f7d88b474d871573ce0d44
Parents: 7e66dc8
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jul 4 15:32:09 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jul 4 15:33:50 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/decanter/collector/kafka/KafkaCollector.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/61bd1c36/collector/kafka/src/main/java/org/apache/karaf/decanter/collector/kafka/KafkaCollector.java
----------------------------------------------------------------------
diff --git a/collector/kafka/src/main/java/org/apache/karaf/decanter/collector/kafka/KafkaCollector.java b/collector/kafka/src/main/java/org/apache/karaf/decanter/collector/kafka/KafkaCollector.java
index 4371da3..0d1487d 100644
--- a/collector/kafka/src/main/java/org/apache/karaf/decanter/collector/kafka/KafkaCollector.java
+++ b/collector/kafka/src/main/java/org/apache/karaf/decanter/collector/kafka/KafkaCollector.java
@@ -38,6 +38,7 @@ import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
+import org.osgi.service.event.EventConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,6 +53,7 @@ public class KafkaCollector implements Runnable {
private Dictionary<String, Object> properties;
private KafkaConsumer<String, String> consumer;
private String topic;
+ private String eventAdminTopic;
private boolean consuming = false;
private EventAdmin dispatcher;
@@ -63,6 +65,7 @@ public class KafkaCollector implements Runnable {
properties = componentContext.getProperties();
topic = getValue(properties, "topic", "decanter");
+ eventAdminTopic = getValue(properties, EventConstants.EVENT_TOPIC, "decanter/collect/kafka/decanter");
Properties config = new Properties();
@@ -191,7 +194,7 @@ public class KafkaCollector implements Runnable {
if (karafName != null) {
data.put("karafName", karafName);
}
- Event event = new Event("decanter/collect/kafka/" + topic, data);
+ Event event = new Event(eventAdminTopic, data);
dispatcher.postEvent(event);
}
[2/2] karaf-decanter git commit: Use required config for ES appender
rest
Posted by cs...@apache.org.
Use required config for ES appender rest
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/7e66dc84
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/7e66dc84
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/7e66dc84
Branch: refs/heads/master
Commit: 7e66dc84f93eb1022e9e5b59016f3cd82109c632
Parents: bfe1552
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jul 4 15:31:28 2016 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jul 4 15:33:50 2016 +0200
----------------------------------------------------------------------
.../appender/elasticsearch/rest/ElasticsearchAppender.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/7e66dc84/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
----------------------------------------------------------------------
diff --git a/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java b/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
index 5d97397..2cdce23 100644
--- a/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
+++ b/appender/elasticsearch-rest/src/main/java/org/apache/karaf/decanter/appender/elasticsearch/rest/ElasticsearchAppender.java
@@ -26,6 +26,7 @@ import org.apache.karaf.decanter.api.marshaller.Marshaller;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.event.Event;
@@ -44,6 +45,7 @@ import io.searchbox.core.Index;
@Component(
name ="org.apache.karaf.decanter.appender.elasticsearch.rest",
immediate = true,
+ configurationPolicy = ConfigurationPolicy.REQUIRE,
property=EventConstants.EVENT_TOPIC + "=decanter/collect/*"
)
public class ElasticsearchAppender implements EventHandler {