Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
ce07ccbc
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ce07ccbc
编写于
6月 01, 2017
作者:
A
Andres Rodriguez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-44608] Don't check for monitor activation if it is disabled
上级
fb5c899e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
12 addition
and
9 deletion
+12
-9
core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
...a/jenkins/management/AdministrativeMonitorsDecorator.java
+2
-5
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+8
-0
core/src/main/resources/jenkins/model/Jenkins/manage.jelly
core/src/main/resources/jenkins/model/Jenkins/manage.jelly
+2
-4
未找到文件。
core/src/main/java/jenkins/management/AdministrativeMonitorsDecorator.java
浏览文件 @
ce07ccbc
...
...
@@ -78,8 +78,7 @@ public class AdministrativeMonitorsDecorator extends PageDecorator {
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
;
...
...
@@ -88,9 +87,7 @@ public class AdministrativeMonitorsDecorator extends PageDecorator {
// 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
;
}
...
...
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
ce07ccbc
...
...
@@ -288,6 +288,7 @@ import java.util.logging.Level;
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
.*;
...
...
@@ -2172,6 +2173,13 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
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
;
}
...
...
core/src/main/resources/jenkins/model/Jenkins/manage.jelly
浏览文件 @
ce07ccbc
...
...
@@ -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" />
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录