Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
cb308725
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,发现更多精彩内容 >>
提交
cb308725
编写于
6月 12, 2018
作者:
O
Oleg Nenashev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-51889] - Stop using Guava’s NullOutputStream, document setChannel API
上级
3783cc40
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
5 deletion
+26
-5
core/src/main/java/hudson/slaves/SlaveComputer.java
core/src/main/java/hudson/slaves/SlaveComputer.java
+26
-5
未找到文件。
core/src/main/java/hudson/slaves/SlaveComputer.java
浏览文件 @
cb308725
...
...
@@ -23,7 +23,6 @@
*/
package
hudson.slaves
;
import
com.google.common.io.NullOutputStream
;
import
hudson.AbortException
;
import
hudson.FilePath
;
import
hudson.Functions
;
...
...
@@ -387,7 +386,28 @@ public class SlaveComputer extends Computer {
private
final
Object
channelLock
=
new
Object
();
public
void
setChannel
(
InputStream
in
,
OutputStream
out
,
TaskListener
taskListener
,
Channel
.
Listener
listener
)
throws
IOException
,
InterruptedException
{
/**
* Creates a {@link Channel} from the given stream and sets that to this agent.
*
* @param in
* Stream connected to the remote agent. It's the caller's responsibility to do
* buffering on this stream, if that's necessary.
* @param out
* Stream connected to the remote peer. It's the caller's responsibility to do
* buffering on this stream, if that's necessary.
* @param taskListener
* Receives the portion of data in <tt>is</tt> before
* the data goes into the "binary mode". This is useful
* when the established communication channel might include some data that might
* be useful for debugging/trouble-shooting.
* @param listener
* Gets a notification when the channel closes, to perform clean up. Can be null.
* By the time this method is called, the cause of the termination is reported to the user,
* so the implementation of the listener doesn't need to do that again.
*/
public
void
setChannel
(
@Nonnull
InputStream
in
,
@Nonnull
OutputStream
out
,
@Nonnull
TaskListener
taskListener
,
@CheckForNull
Channel
.
Listener
listener
)
throws
IOException
,
InterruptedException
{
setChannel
(
in
,
out
,
taskListener
.
getLogger
(),
listener
);
}
...
...
@@ -410,7 +430,9 @@ public class SlaveComputer extends Computer {
* By the time this method is called, the cause of the termination is reported to the user,
* so the implementation of the listener doesn't need to do that again.
*/
public
void
setChannel
(
InputStream
in
,
OutputStream
out
,
OutputStream
launchLog
,
Channel
.
Listener
listener
)
throws
IOException
,
InterruptedException
{
public
void
setChannel
(
@Nonnull
InputStream
in
,
@Nonnull
OutputStream
out
,
@CheckForNull
OutputStream
launchLog
,
@CheckForNull
Channel
.
Listener
listener
)
throws
IOException
,
InterruptedException
{
ChannelBuilder
cb
=
new
ChannelBuilder
(
nodeName
,
threadPoolForRemoting
)
.
withMode
(
Channel
.
Mode
.
NEGOTIATE
)
.
withHeaderStream
(
launchLog
);
...
...
@@ -437,7 +459,7 @@ public class SlaveComputer extends Computer {
* Gets a notification when the channel closes, to perform clean up. Can be {@code null}.
* By the time this method is called, the cause of the termination is reported to the user,
* so the implementation of the listener doesn't need to do that again.
* @since
TODO
* @since
2.127
*/
@Restricted
(
Beta
.
class
)
public
void
setChannel
(
@Nonnull
ChannelBuilder
cb
,
...
...
@@ -451,7 +473,6 @@ public class SlaveComputer extends Computer {
if
(
headerStream
==
null
)
{
LOGGER
.
log
(
Level
.
WARNING
,
"No header stream defined when setting channel for computer {0}. "
+
"Launch log won't be printed"
,
this
);
headerStream
=
new
NullOutputStream
();
}
Channel
channel
=
cb
.
build
(
commandTransport
);
setChannel
(
channel
,
headerStream
,
listener
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录