From 36ca349ad10c3f17e69a70c73fefcb2ae3405ca7 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Tue, 13 Aug 2013 17:29:09 -0700
Subject: [PATCH] Include the node name

Change-Id: I1cf2aee446c1e51c8eb15f7d84c3e828f3716cce
---
 .../org/jenkinsci/plugins/ZMQEventPublisher/Phase.java | 10 ++++++++++
 .../plugins/ZMQEventPublisher/model/BuildState.java    | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/Phase.java b/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/Phase.java
index 6518e5e..bddf36e 100644
--- a/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/Phase.java
+++ b/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/Phase.java
@@ -23,6 +23,8 @@ import hudson.model.Job;
 import hudson.model.ParameterValue;
 import hudson.model.ParametersAction;
 import hudson.model.Run;
+import hudson.model.Executor;
+import hudson.model.Computer;
 import hudson.model.TaskListener;
 
 import java.io.IOException;
@@ -71,6 +73,14 @@ public enum Phase {
             buildState.setFullUrl(rootUrl + run.getUrl());
         }
 
+        Executor executor = run.getExecutor();
+        if (executor != null) {
+            Computer computer = executor.getOwner();
+            if (computer != null) {
+                buildState.setNodeName(computer.getName());
+            }
+        }
+
         jobState.setBuild(buildState);
 
         ParametersAction paramsAction = run.getAction(ParametersAction.class);
diff --git a/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/model/BuildState.java b/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/model/BuildState.java
index f2a689f..68ca339 100644
--- a/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/model/BuildState.java
+++ b/src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/model/BuildState.java
@@ -34,6 +34,8 @@ public class BuildState {
 
     private Map<String, String> parameters;
 
+    private String nodeName;
+
     public int getNumber() {
         return number;
     }
@@ -81,4 +83,12 @@ public class BuildState {
     public void setParameters(Map<String, String> params) {
         this.parameters = params;
     }
+
+    public String getNodeName() {
+        return nodeName;
+    }
+
+    public void setNodeName(String nodeName) {
+        this.nodeName = nodeName;
+    }
 }