Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
36eea3dc
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,发现更多精彩内容 >>
提交
36eea3dc
编写于
9月 17, 2015
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-30777] Generalized the signature to work with Run, not just AbstractBuild.
上级
11c795cc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
42 addition
and
2 deletion
+42
-2
core/src/main/java/hudson/console/ConsoleLogFilter.java
core/src/main/java/hudson/console/ConsoleLogFilter.java
+41
-1
core/src/main/java/hudson/model/Run.java
core/src/main/java/hudson/model/Run.java
+1
-1
未找到文件。
core/src/main/java/hudson/console/ConsoleLogFilter.java
浏览文件 @
36eea3dc
...
...
@@ -26,7 +26,14 @@ package hudson.console;
import
hudson.ExtensionList
;
import
hudson.ExtensionPoint
;
import
hudson.FilePath
;
import
hudson.Util
;
import
hudson.model.AbstractBuild
;
import
hudson.model.Build
;
import
hudson.model.Job
;
import
hudson.model.Node
;
import
hudson.model.Run
;
import
hudson.scm.SCM
;
import
hudson.tasks.BuildWrapper
;
import
hudson.util.ArgumentListBuilder
;
import
jenkins.model.Jenkins
;
...
...
@@ -48,8 +55,41 @@ public abstract class ConsoleLogFilter implements ExtensionPoint {
/**
* Called on the start of each build, giving extensions a chance to intercept
* the data that is written to the log.
*
* @deprecated as of 1.630. Use {@link #decorateLogger(Run, OutputStream)}
*/
public
abstract
OutputStream
decorateLogger
(
AbstractBuild
build
,
OutputStream
logger
)
throws
IOException
,
InterruptedException
;
public
OutputStream
decorateLogger
(
AbstractBuild
build
,
OutputStream
logger
)
throws
IOException
,
InterruptedException
{
if
(
Util
.
isOverridden
(
ConsoleLogFilter
.
class
,
getClass
(),
"decorateLogger"
,
Run
.
class
,
OutputStream
.
class
))
{
// old client calling newer implementation. forward the call.
return
decorateLogger
((
Run
)
build
,
logger
);
}
else
{
// happens only if the subtype fails to override neither decorateLogger method
throw
new
AssertionError
(
"The plugin '"
+
this
.
getClass
().
getName
()
+
"' still uses "
+
"deprecated decorateLogger(AbstractBuild,OutputStream) method. "
+
"Update the plugin to use setUp(Run,OutputStream) instead."
);
}
}
/**
* Called on the start of each build, giving extensions a chance to intercept
* the data that is written to the log.
*
* <p>
* Even though this method is not marked 'abstract', this is the method that must be overridden
* by extensions.
*/
public
OutputStream
decorateLogger
(
Run
build
,
OutputStream
logger
)
throws
IOException
,
InterruptedException
{
// this implementation is backward compatibility thunk in case subtypes only override the
// old signature (AbstractBuild,OutputStream)
if
(
build
instanceof
AbstractBuild
)
{
// maybe the plugin implements the old signature.
return
decorateLogger
((
AbstractBuild
)
build
,
logger
);
}
else
{
// this ConsoleLogFilter can only decorate AbstractBuild, so just pass through
return
logger
;
}
}
/**
* All the registered {@link ConsoleLogFilter}s.
...
...
core/src/main/java/hudson/model/Run.java
浏览文件 @
36eea3dc
...
...
@@ -1710,7 +1710,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
// Global log filters
for
(
ConsoleLogFilter
filter
:
ConsoleLogFilter
.
all
())
{
logger
=
filter
.
decorateLogger
(
(
AbstractBuild
)
build
,
logger
);
logger
=
filter
.
decorateLogger
(
build
,
logger
);
}
// Project specific log filters
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录