Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
86bf6b76
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,发现更多精彩内容 >>
提交
86bf6b76
编写于
4月 21, 2015
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow the advertised TCP slave agent port number to be modified.
This allows TCP slave agent port to be reverse proxied.
上级
64e832f9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
3 deletion
+18
-3
changelog.html
changelog.html
+2
-0
core/src/main/java/hudson/Functions.java
core/src/main/java/hudson/Functions.java
+4
-3
core/src/main/java/hudson/TcpSlaveAgentListener.java
core/src/main/java/hudson/TcpSlaveAgentListener.java
+12
-0
未找到文件。
changelog.html
浏览文件 @
86bf6b76
...
...
@@ -58,6 +58,8 @@ Upcoming changes</a>
<li
class=
bug
>
Search box did not work well inside folders.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-24433"
>
issue 24433
</a>
)
<li
class=
rfe
>
Advertised TCP slave agent port number is made tweakable.
</ul>
</div>
<!--=TRUNK-END=-->
<h3><a
name=
v1.610
>
What's new in 1.610
</a>
(2015/04/19)
</h3>
...
...
core/src/main/java/hudson/Functions.java
浏览文件 @
86bf6b76
...
...
@@ -1887,9 +1887,10 @@ public class Functions {
TcpSlaveAgentListener
tal
=
j
.
tcpSlaveAgentListener
;
if
(
tal
!=
null
)
{
rsp
.
setIntHeader
(
"X-Hudson-CLI-Port"
,
tal
.
getPort
());
rsp
.
setIntHeader
(
"X-Jenkins-CLI-Port"
,
tal
.
getPort
());
rsp
.
setIntHeader
(
"X-Jenkins-CLI2-Port"
,
tal
.
getPort
());
int
p
=
TcpSlaveAgentListener
.
CLI_PORT
!=
null
?
TcpSlaveAgentListener
.
CLI_PORT
:
tal
.
getPort
();
rsp
.
setIntHeader
(
"X-Hudson-CLI-Port"
,
p
);
rsp
.
setIntHeader
(
"X-Jenkins-CLI-Port"
,
p
);
rsp
.
setIntHeader
(
"X-Jenkins-CLI2-Port"
,
p
);
rsp
.
setHeader
(
"X-Jenkins-CLI-Host"
,
TcpSlaveAgentListener
.
CLI_HOST_NAME
);
}
}
...
...
core/src/main/java/hudson/TcpSlaveAgentListener.java
浏览文件 @
86bf6b76
...
...
@@ -204,6 +204,18 @@ public final class TcpSlaveAgentListener extends Thread {
* TODO: think about how to expose this (including whether this needs to be exposed at all.)
*/
public
static
String
CLI_HOST_NAME
=
System
.
getProperty
(
TcpSlaveAgentListener
.
class
.
getName
()+
".hostName"
);
/**
* Port number that we advertise the CLI client to connect to.
* This is primarily for the case where the port that Jenkins runs is different from the port
* that external world should connect to, because of the presence of NAT / port-forwarding / TCP reverse
* proxy.
*
* If left to null, fall back to {@link #getPort()}
*
* @since 1.611
*/
public
static
Integer
CLI_PORT
=
Integer
.
getInteger
(
TcpSlaveAgentListener
.
class
.
getName
()+
".port"
);
}
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录