x
/
zmq-event-publisher
Code Issues Proposed changes

Use Hudson object to get global config for plugin 

Instead of using the Run object for builds (which may be null) to get
the global config for the plugin retrieve it directly from a Hudson
instance.
This commit is contained in:
Clark Boylan 2013-01-29 20:28:39 -08:00
parent 8d334cd9a9
commit 7d54898d4e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/Phase.java
View File

@ -40,12 +40,15 @@ public enum Phase {
@SuppressWarnings({ "unchecked", "rawtypes" })
public String handlePhase(Run run, String status, TaskListener listener) {
HudsonNotificationProperty property = (HudsonNotificationProperty) run.getParent().getProperty(HudsonNotificationProperty.class);
if (property != null) {
HudsonNotificationProperty.HudsonNotificationPropertyDescriptor globalProperty = property.getDescriptor();
if (globalProperty.isGloballyEnabled() || property.isEnabled()) {
return buildMessage(run.getParent(), run, status);
}
Hudson hudson = Hudson.getInstance();
HudsonNotificationProperty property = (HudsonNotificationProperty)
run.getParent().getProperty(HudsonNotificationProperty.class);
HudsonNotificationProperty.HudsonNotificationPropertyDescriptor globalProperty =
(HudsonNotificationProperty.HudsonNotificationPropertyDescriptor)
hudson.getDescriptor(HudsonNotificationProperty.class);
if ((property != null && property.isEnabled()) ||
(globalProperty != null && globalProperty.isGloballyEnabled())) {
return buildMessage(run.getParent(), run, status);
}
return null;
}

9
src/main/java/org/jenkinsci/plugins/ZMQEventPublisher/RunListenerImpl.java
View File

@ -19,6 +19,7 @@ package org.jenkinsci.plugins.ZMQEventPublisher;
import hudson.Extension;
import hudson.EnvVars;
import hudson.model.Hudson;
import hudson.model.Result;
import hudson.model.Run;
import hudson.model.TaskListener;
@ -48,9 +49,11 @@ public class RunListenerImpl extends RunListener<Run> {
}
private int getPort(Run build) {
HudsonNotificationProperty property = (HudsonNotificationProperty) build.getParent().getProperty(HudsonNotificationProperty.class);
if (property != null) {
HudsonNotificationProperty.HudsonNotificationPropertyDescriptor globalProperty = property.getDescriptor();
Hudson hudson = Hudson.getInstance();
HudsonNotificationProperty.HudsonNotificationPropertyDescriptor globalProperty =
(HudsonNotificationProperty.HudsonNotificationPropertyDescriptor)
hudson.getDescriptor(HudsonNotificationProperty.class);
if (globalProperty != null) {
return globalProperty.getPort();
}
return 8888;