Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
8602715b
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,发现更多精彩内容 >>
未验证
提交
8602715b
编写于
9月 22, 2016
作者:
V
Vincent Latombe
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-38187] Fixes @daniel-beck reviews
上级
5cff734b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
12 deletion
+7
-12
core/src/main/java/jenkins/model/Jenkins.java
core/src/main/java/jenkins/model/Jenkins.java
+2
-8
core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly
.../EnforceSlaveAgentPortAdministrativeMonitor/message.jelly
+3
-3
core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties
...rceSlaveAgentPortAdministrativeMonitor/message.properties
+2
-1
未找到文件。
core/src/main/java/jenkins/model/Jenkins.java
浏览文件 @
8602715b
...
@@ -1220,6 +1220,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
...
@@ -1220,6 +1220,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
}
}
@Extension
@Extension
@Restricted
(
NoExternalUse
.
class
)
public
static
class
EnforceSlaveAgentPortAdministrativeMonitor
extends
AdministrativeMonitor
{
public
static
class
EnforceSlaveAgentPortAdministrativeMonitor
extends
AdministrativeMonitor
{
@Inject
@Inject
Jenkins
j
;
Jenkins
j
;
...
@@ -1234,15 +1235,8 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
...
@@ -1234,15 +1235,8 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
return
Jenkins
.
getSlaveAgentPortInitialValue
(
slaveAgentPort
);
return
Jenkins
.
getSlaveAgentPortInitialValue
(
slaveAgentPort
);
}
}
public
String
getExpectedPortString
()
{
return
Integer
.
toString
(
getExpectedPort
());
}
/**
* Depending on whether the user said "yes" or "no", send him to the right place.
*/
public
void
doAct
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
{
public
void
doAct
(
StaplerRequest
req
,
StaplerResponse
rsp
)
throws
IOException
{
if
(
req
.
hasParameter
(
"
fix
"
))
{
if
(
req
.
hasParameter
(
"
reset
"
))
{
j
.
setSlaveAgentPort
(
getExpectedPort
());
j
.
setSlaveAgentPort
(
getExpectedPort
());
}
}
rsp
.
sendRedirect2
(
req
.
getContextPath
()
+
"/manage"
);
rsp
.
sendRedirect2
(
req
.
getContextPath
()
+
"/manage"
);
...
...
core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly
浏览文件 @
8602715b
<!--
<!--
The MIT License
The MIT License
Copyright (c) 2016, CloudBees
Copyright (c) 2016, CloudBees
, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
of this software and associated documentation files (the "Software"), to deal
...
@@ -24,10 +24,10 @@ THE SOFTWARE.
...
@@ -24,10 +24,10 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<div class="warning">
<div class="warning">
${%description(it.expectedPort
String
)}
${%description(it.expectedPort)}
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
<form method="post" action="${rootURL}/${it.url}/act" name="${it.id}">
<div style="float:right">
<div style="float:right">
<f:submit name="
fix" value="${%Fix
}"/>
<f:submit name="
reset" value="${%reset(it.expectedPort)
}"/>
</div>
</div>
</form>
</form>
</div>
</div>
...
...
core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties
浏览文件 @
8602715b
description
=
Slave Agent Port has been manually changed. Its value will be reset to {0} on restart.
description
=
Slave Agent Port has been manually changed. Its value will be reset to {0,number,#} on restart.
reset
=
Reset to {0,number,#}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录