Repository: incubator-streams Updated Branches: refs/heads/master 91dd9a3c5 -> 6f2acaa21
STREAMS-216 | Updated the broadcast object to contain a streams ID which will make it easier to identify which Stream the beans belong to Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b9f3519b Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b9f3519b Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b9f3519b Branch: refs/heads/master Commit: b9f3519bf18213e5a9b343b1fba25a4b13f2ce3b Parents: b03b1b4 Author: Robert Douglas <[email protected]> Authored: Tue Nov 11 16:26:23 2014 -0600 Committer: Robert Douglas <[email protected]> Committed: Tue Nov 11 16:26:23 2014 -0600 ---------------------------------------------------------------------- .../monitoring/tasks/BroadcastMonitorThread.java | 15 +++++++++++++++ .../org/apache/streams/pojo/json/Broadcast.json | 4 ++++ .../streams/local/builders/LocalStreamBuilder.java | 1 + 3 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b9f3519b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java ---------------------------------------------------------------------- diff --git a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java index 6e07619..40e4cfe 100644 --- a/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java +++ b/streams-monitoring/src/main/java/org/apache/streams/monitoring/tasks/BroadcastMonitorThread.java @@ -45,6 +45,7 @@ public class BroadcastMonitorThread extends NotificationBroadcasterSupport imple private ObjectMapper objectMapper; private Map<String, Object> streamConfig; private String broadcastURI = null; + private String streamName = null; private MessagePersister messagePersister; private volatile boolean keepRunning; @@ -54,6 +55,8 @@ public class BroadcastMonitorThread extends NotificationBroadcasterSupport imple server = ManagementFactory.getPlatformMBeanServer(); setBroadcastURI(); + setStreamName(); + messagePersister = new BroadcastMessagePersister(broadcastURI); initializeObjectMapper(); @@ -103,6 +106,7 @@ public class BroadcastMonitorThread extends NotificationBroadcasterSupport imple } if(broadcast != null) { + broadcast.setStreamIdentifier(streamName); messages.add(objectMapper.writeValueAsString(broadcast)); } } @@ -130,6 +134,17 @@ public class BroadcastMonitorThread extends NotificationBroadcasterSupport imple } } + private void setStreamName() { + if(streamConfig != null && + streamConfig.containsKey("streamsID") && + streamConfig.get("streamsID") != null && + streamConfig.get("streamsID") instanceof String) { + streamName = streamConfig.get("streamsID").toString(); + } else { + streamName = "{\"streamName\":\"Unknown Stream\"}"; + } + } + public void shutdown() { this.keepRunning = false; LOGGER.debug("Shutting down BroadcastMonitor Thread"); http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b9f3519b/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/Broadcast.json ---------------------------------------------------------------------- diff --git a/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/Broadcast.json b/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/Broadcast.json index 4d7f87b..94ec147 100644 --- a/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/Broadcast.json +++ b/streams-pojo/src/main/jsonschema/org/apache/streams/pojo/json/Broadcast.json @@ -8,6 +8,10 @@ "name": { "type": "string", "description": "Name of the MBean" + }, + "streamIdentifier": { + "type": "string", + "description": "The name of the Stream that is currently executing" } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/b9f3519b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java ---------------------------------------------------------------------- diff --git a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java index 47cb08f..26e1b27 100644 --- a/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java +++ b/streams-runtimes/streams-runtime-local/src/main/java/org/apache/streams/local/builders/LocalStreamBuilder.java @@ -49,6 +49,7 @@ public class LocalStreamBuilder implements StreamBuilder { public static final String TIMEOUT_KEY = "TIMEOUT"; public static final String BROADCAST_KEY = "broadcastURI"; + public static final String STREAM_IDENTIFIER_KEY = "streamsID"; private Map<String, StreamComponent> providers; private Map<String, StreamComponent> components;
