You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2016/03/25 08:47:57 UTC
karaf-decanter git commit: KARAF-4448 - Populate additional
properties in eventadmin collector and rename type as eventType
Repository: karaf-decanter
Updated Branches:
refs/heads/master 54d86faa2 -> 14b2cedfb
KARAF-4448 - Populate additional properties in eventadmin collector and rename type as eventType
Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/14b2cedf
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/14b2cedf
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/14b2cedf
Branch: refs/heads/master
Commit: 14b2cedfb93d29d335a89ce0fbc8e2ef7841a5d0
Parents: 54d86fa
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Fri Mar 25 08:47:15 2016 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Fri Mar 25 08:47:15 2016 +0100
----------------------------------------------------------------------
.../collector/eventadmin/EventCollector.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/14b2cedf/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
----------------------------------------------------------------------
diff --git a/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java b/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
index 09a7bc9..62a4d83 100644
--- a/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
+++ b/collector/eventadmin/src/main/java/org/apache/karaf/decanter/collector/eventadmin/EventCollector.java
@@ -23,6 +23,7 @@ import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
+import java.net.InetAddress;
import java.util.HashMap;
import java.util.Map;
@@ -38,12 +39,23 @@ public class EventCollector implements EventHandler {
public void handleEvent(Event event) {
String topic = event.getTopic();
Map<String, Object> data = new HashMap<>();
+ data.put("type", "eventadmin");
+ String karafName = System.getProperty("karaf.name");
+ if (karafName != null) {
+ data.put("karafName", karafName);
+ }
+ try {
+ data.put("hostAddress", InetAddress.getLocalHost().getHostAddress());
+ data.put("hostName", InetAddress.getLocalHost().getHostName());
+ } catch (Exception e) {
+ // nothing to do
+ }
for (String property : event.getPropertyNames()) {
if (property.equals("type")) {
if (event.getProperty(property) != null) {
- data.put(property, event.getProperty(property).toString());
+ data.put("eventType", event.getProperty(property).toString());
} else {
- data.put(property, "eventadmin");
+ data.put("eventType", "eventadmin");
}
} else {
data.put(property, event.getProperty(property));