Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-44608] Don't check for monitor activation if it is disabled
(cherry picked from commit ce07ccb)
  • Loading branch information
andresrc authored and olivergondza committed Jul 4, 2017
1 parent 8c4aae0 commit 65def10
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
Expand Up @@ -78,8 +78,7 @@ public int getActiveAdministrativeMonitorsCount() {

public Collection<AdministrativeMonitor> getActiveAdministrativeMonitors() {
Collection<AdministrativeMonitor> active = new ArrayList<>();
Collection<AdministrativeMonitor> ams = new ArrayList<>(Jenkins.getInstance().administrativeMonitors);
for (AdministrativeMonitor am : ams) {
for (AdministrativeMonitor am : Jenkins.getInstance().getActiveAdministrativeMonitors()) {
if (am instanceof ReverseProxySetupMonitor) {
// TODO make reverse proxy monitor work when shown on any URL
continue;
Expand All @@ -88,9 +87,7 @@ public Collection<AdministrativeMonitor> getActiveAdministrativeMonitors() {
// TODO make URI encoding monitor work when shown on any URL
continue;
}
if (am.isEnabled() && am.isActivated()) {
active.add(am);
}
active.add(am);
}
return active;
}
Expand Down
8 changes: 8 additions & 0 deletions core/src/main/java/jenkins/model/Jenkins.java
Expand Up @@ -288,6 +288,7 @@
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

import static hudson.Util.*;
import static hudson.init.InitMilestone.*;
Expand Down Expand Up @@ -2172,6 +2173,13 @@ public AdministrativeMonitor getAdministrativeMonitor(String id) {
return null;
}

/**
* Returns the enabled and activated administrative monitors.
*/
public List<AdministrativeMonitor> getActiveAdministrativeMonitors() {
return administrativeMonitors.stream().filter(m -> m.isEnabled() && m.isActivated()).collect(Collectors.toList());
}

public NodeDescriptor getDescriptor() {
return DescriptorImpl.INSTANCE;
}
Expand Down
6 changes: 2 additions & 4 deletions core/src/main/resources/jenkins/model/Jenkins/manage.jelly
Expand Up @@ -60,10 +60,8 @@ THE SOFTWARE.
<l:main-panel>
<h1>${%Manage Jenkins}</h1>

<j:forEach var="am" items="${app.administrativeMonitors}">
<j:if test="${am.isActivated() and am.isEnabled()}">
<st:include page="message.jelly" it="${am}" />
</j:if>
<j:forEach var="am" items="${app.activeAdministrativeMonitors}">
<st:include page="message.jelly" it="${am}" />
</j:forEach>

<st:include page="downgrade.jelly" />
Expand Down

0 comments on commit 65def10

Please sign in to comment.