Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
23d800cf
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,发现更多精彩内容 >>
提交
23d800cf
编写于
7月 16, 2015
作者:
D
Daniel Beck
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1617 from KostyaSha/cronFix
Don't run trigger for disabled/copied projects
上级
9cd1929c
1bea95f7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
7 deletion
+23
-7
core/src/main/java/hudson/model/AbstractProject.java
core/src/main/java/hudson/model/AbstractProject.java
+11
-7
core/src/main/java/hudson/triggers/Trigger.java
core/src/main/java/hudson/triggers/Trigger.java
+12
-0
未找到文件。
core/src/main/java/hudson/model/AbstractProject.java
浏览文件 @
23d800cf
...
...
@@ -324,11 +324,13 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
buildMixIn
.
onLoad
(
parent
,
name
);
builds
=
buildMixIn
.
getRunMap
();
triggers
().
setOwner
(
this
);
for
(
Trigger
t
:
triggers
())
{
try
{
t
.
start
(
this
,
Items
.
currentlyUpdatingByXml
());
}
catch
(
Throwable
e
)
{
LOGGER
.
log
(
Level
.
WARNING
,
"could not start trigger while loading project '"
+
getFullName
()
+
"'"
,
e
);
if
(
isBuildable
())
{
for
(
Trigger
t
:
triggers
())
{
try
{
t
.
start
(
this
,
Items
.
currentlyUpdatingByXml
());
}
catch
(
Throwable
e
)
{
LOGGER
.
log
(
Level
.
WARNING
,
"could not start trigger while loading project '"
+
getFullName
()
+
"'"
,
e
);
}
}
}
if
(
scm
==
null
)
...
...
@@ -1879,8 +1881,10 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
for
(
Trigger
t
:
triggers
())
t
.
stop
();
triggers
.
replaceBy
(
buildDescribable
(
req
,
Trigger
.
for_
(
this
)));
for
(
Trigger
t
:
triggers
())
t
.
start
(
this
,
true
);
if
(
isBuildable
())
{
for
(
Trigger
t
:
triggers
())
t
.
start
(
this
,
true
);
}
}
/**
...
...
core/src/main/java/hudson/triggers/Trigger.java
浏览文件 @
23d800cf
...
...
@@ -99,6 +99,8 @@ public abstract class Trigger<J extends Item> implements Describable<Trigger<?>>
*
* This method is invoked when {@link #Trigger(String)} is used
* to create an instance, and the crontab matches the current time.
* <p>
* Maybe run even before {@link #start(hudson.model.Item, boolean)}, prepare for it.
*/
public
void
run
()
{}
...
...
@@ -241,6 +243,10 @@ public abstract class Trigger<J extends Item> implements Describable<Trigger<?>>
// FIXME allow to set a global crontab spec
previousSynchronousPolling
=
scmd
.
getExecutor
().
submit
(
new
DependencyRunner
(
new
ProjectRunnable
()
{
public
void
run
(
AbstractProject
p
)
{
if
(!
p
.
isBuildable
())
{
return
;
//skip disabled/copied project
}
for
(
Trigger
t
:
(
Collection
<
Trigger
>)
p
.
getTriggers
().
values
())
{
if
(
t
instanceof
SCMTrigger
)
{
LOGGER
.
fine
(
"synchronously triggering SCMTrigger for project "
+
t
.
job
.
getName
());
...
...
@@ -256,6 +262,12 @@ public abstract class Trigger<J extends Item> implements Describable<Trigger<?>>
// Process all triggers, except SCMTriggers when synchronousPolling is set
for
(
ParameterizedJobMixIn
.
ParameterizedJob
p
:
inst
.
getAllItems
(
ParameterizedJobMixIn
.
ParameterizedJob
.
class
))
{
if
(
p
instanceof
AbstractProject
<?,
?>)
{
if
(!((
AbstractProject
)
p
).
isBuildable
())
{
continue
;
// skip disabled/copied project
}
}
for
(
Trigger
t
:
p
.
getTriggers
().
values
())
{
if
(!
(
t
instanceof
SCMTrigger
&&
scmd
.
synchronousPolling
))
{
LOGGER
.
log
(
Level
.
FINE
,
"cron checking {0} with spec ‘{1}’"
,
new
Object
[]
{
p
,
t
.
spec
.
trim
()});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录