Repository: nifi Updated Branches: refs/heads/master 548561ed4 -> 2c69c2532
NIFI-2007: - Restoring bulletin functionality. - Ensuring appropriate merging of bulletins in clustered responses. - Updated the phrasing for cluster-related bulletins This closes #531. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2c69c253 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2c69c253 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2c69c253 Branch: refs/heads/master Commit: 2c69c2532374a23feaddf1117870986d4f376dc4 Parents: 0b437e0 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Wed Jun 15 21:42:05 2016 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Fri Jun 17 13:20:20 2016 -0400 ---------------------------------------------------------------------- .../nifi/cluster/coordination/node/NodeClusterCoordinator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2c69c253/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java index 158468a..88853e3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/node/NodeClusterCoordinator.java @@ -278,12 +278,12 @@ public class NodeClusterCoordinator implements ClusterCoordinator, ProtocolHandl @Override public void reportEvent(final NodeIdentifier nodeId, final Severity severity, final String event) { - eventReporter.reportEvent(severity, nodeId == null ? EVENT_CATEGORY : nodeId.toString(), event); + eventReporter.reportEvent(severity, EVENT_CATEGORY, "Event Reported for " + nodeId.toString() + " -- " + event); if (nodeId != null) { addNodeEvent(nodeId, severity, event); } - final String message = nodeId == null ? event : "Event Reported for " + nodeId + ": " + event; + final String message = nodeId == null ? event : "Event Reported for " + nodeId + " -- " + event; switch (severity) { case ERROR: logger.error(message);
