Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
f28409ee
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
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,发现更多精彩内容 >>
提交
f28409ee
编写于
4月 21, 2011
作者:
A
Andrew Bayer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-9230] Added unique instance identifier to UDP broadcast and DNS multicast.
上级
7bf27942
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
0 deletion
+8
-0
changelog.html
changelog.html
+3
-0
core/src/main/java/hudson/DNSMultiCast.java
core/src/main/java/hudson/DNSMultiCast.java
+3
-0
core/src/main/java/hudson/UDPBroadcastThread.java
core/src/main/java/hudson/UDPBroadcastThread.java
+2
-0
未找到文件。
changelog.html
浏览文件 @
f28409ee
...
@@ -65,6 +65,9 @@ Upcoming changes</a>
...
@@ -65,6 +65,9 @@ Upcoming changes</a>
<li
class=
bug
>
<li
class=
bug
>
Fixed a persistence problem in
<tt>
View$PropertyList
</tt>
Fixed a persistence problem in
<tt>
View$PropertyList
</tt>
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9367"
>
issue 9367
</a>
)
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9367"
>
issue 9367
</a>
)
<li
class=
bug
>
Added unique instance identifier to UDP broadcast and DNS multicast information.
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-9230"
>
issue 9230
</a>
)
<li
class=
rfe
>
<li
class=
rfe
>
Maven agent needs a fix for the 'hardcoded' socket connection to localhost
Maven agent needs a fix for the 'hardcoded' socket connection to localhost
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-6795"
>
issue 6795
</a>
)
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-6795"
>
issue 6795
</a>
)
...
...
core/src/main/java/hudson/DNSMultiCast.java
浏览文件 @
f28409ee
package
hudson
;
package
hudson
;
import
hudson.model.Hudson
;
import
hudson.model.Hudson
;
import
hudson.Util
;
import
javax.jmdns.JmDNS
;
import
javax.jmdns.JmDNS
;
import
javax.jmdns.ServiceInfo
;
import
javax.jmdns.ServiceInfo
;
...
@@ -39,6 +40,8 @@ public class DNSMultiCast implements Closeable {
...
@@ -39,6 +40,8 @@ public class DNSMultiCast implements Closeable {
if
(
tal
!=
null
)
if
(
tal
!=
null
)
props
.
put
(
"slave-port"
,
String
.
valueOf
(
tal
.
getPort
()));
props
.
put
(
"slave-port"
,
String
.
valueOf
(
tal
.
getPort
()));
props
.
put
(
"server-id"
,
Util
.
getDigestOf
(
hudson
.
getSecretKey
()));
jmdns
.
registerService
(
ServiceInfo
.
create
(
"_hudson._tcp.local."
,
"hudson"
,
jmdns
.
registerService
(
ServiceInfo
.
create
(
"_hudson._tcp.local."
,
"hudson"
,
80
,
0
,
0
,
props
));
// for backward compatibility
80
,
0
,
0
,
props
));
// for backward compatibility
jmdns
.
registerService
(
ServiceInfo
.
create
(
"_jenkins._tcp.local."
,
"jenkins"
,
jmdns
.
registerService
(
ServiceInfo
.
create
(
"_jenkins._tcp.local."
,
"jenkins"
,
...
...
core/src/main/java/hudson/UDPBroadcastThread.java
浏览文件 @
f28409ee
...
@@ -25,6 +25,7 @@ package hudson;
...
@@ -25,6 +25,7 @@ package hudson;
import
hudson.model.Hudson
;
import
hudson.model.Hudson
;
import
hudson.util.OneShotEvent
;
import
hudson.util.OneShotEvent
;
import
hudson.Util
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.net.BindException
;
import
java.net.BindException
;
...
@@ -77,6 +78,7 @@ public class UDPBroadcastThread extends Thread {
...
@@ -77,6 +78,7 @@ public class UDPBroadcastThread extends Thread {
StringBuilder
rsp
=
new
StringBuilder
(
"<hudson>"
);
StringBuilder
rsp
=
new
StringBuilder
(
"<hudson>"
);
tag
(
rsp
,
"version"
,
Hudson
.
VERSION
);
tag
(
rsp
,
"version"
,
Hudson
.
VERSION
);
tag
(
rsp
,
"url"
,
hudson
.
getRootUrl
());
tag
(
rsp
,
"url"
,
hudson
.
getRootUrl
());
tag
(
rsp
,
"server-id"
,
Util
.
getDigestOf
(
hudson
.
getSecretKey
()));
tag
(
rsp
,
"slave-port"
,
tal
==
null
?
null
:
tal
.
getPort
());
tag
(
rsp
,
"slave-port"
,
tal
==
null
?
null
:
tal
.
getPort
());
for
(
UDPBroadcastFragment
f
:
UDPBroadcastFragment
.
all
())
for
(
UDPBroadcastFragment
f
:
UDPBroadcastFragment
.
all
())
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录