Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
68842017
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,发现更多精彩内容 >>
提交
68842017
编写于
5月 13, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-17933] Catch errors in init.groovy.
上级
e1473e20
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
57 addition
and
4 deletion
+57
-4
changelog.html
changelog.html
+3
-1
core/src/main/java/hudson/init/impl/GroovyInitScript.java
core/src/main/java/hudson/init/impl/GroovyInitScript.java
+7
-3
test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java
.../src/test/java/hudson/init/impl/GroovyInitScriptTest.java
+47
-0
test/src/test/resources/hudson/init/impl/GroovyInitScriptTest/errorsHandled.zip
...s/hudson/init/impl/GroovyInitScriptTest/errorsHandled.zip
+0
-0
未找到文件。
changelog.html
浏览文件 @
68842017
...
...
@@ -55,7 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div
id=
"trunk"
style=
"display:none"
>
<!--=TRUNK-BEGIN=-->
<ul
class=
image
>
<li
class=
>
<li
class=
bug
>
Errors in
<code>
init.groovy
</code>
halted startup; changed to just log a warning.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-17933"
>
issue 17933
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
core/src/main/java/hudson/init/impl/GroovyInitScript.java
浏览文件 @
68842017
...
...
@@ -31,12 +31,12 @@ import java.io.FileFilter;
import
java.io.IOException
;
import
java.net.URL
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.logging.Logger
;
import
jenkins.model.Jenkins
;
import
static
hudson
.
init
.
InitMilestone
.
JOB_LOADED
;
import
hudson.init.Initializer
;
import
java.util.logging.Level
;
/**
* Run the initialization script, if it exists.
...
...
@@ -78,9 +78,13 @@ public class GroovyInitScript {
execute
(
new
GroovyCodeSource
(
initScript
));
}
private
static
void
execute
(
GroovyCodeSource
initScript
)
throws
IOException
{
private
static
void
execute
(
GroovyCodeSource
initScript
)
{
GroovyShell
shell
=
new
GroovyShell
(
Jenkins
.
getInstance
().
getPluginManager
().
uberClassLoader
);
shell
.
evaluate
(
initScript
);
try
{
shell
.
evaluate
(
initScript
);
}
catch
(
RuntimeException
x
)
{
LOGGER
.
log
(
Level
.
WARNING
,
"Failed to run script "
+
initScript
.
getName
(),
x
);
}
}
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
GroovyInitScript
.
class
.
getName
());
...
...
test/src/test/java/hudson/init/impl/GroovyInitScriptTest.java
0 → 100644
浏览文件 @
68842017
/*
* The MIT License
*
* Copyright 2013 Jesse Glick.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package
hudson.init.impl
;
import
static
org
.
junit
.
Assert
.*;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.Bug
;
import
org.jvnet.hudson.test.JenkinsRule
;
import
org.jvnet.hudson.test.recipes.LocalData
;
public
class
GroovyInitScriptTest
{
@Rule
public
JenkinsRule
j
=
new
JenkinsRule
();
@Bug
(
17933
)
@LocalData
@Test
public
void
errorsHandled
()
throws
Exception
{
assertEquals
(
"true"
,
System
.
getProperty
(
"started"
));
/* XXX Jenkins.logRecords empty during a test, and adding a handler to root logger in JenkinsRule.before() does not work:
assertTrue(log, log.contains("Nonexistent"));
*/
}
}
test/src/test/resources/hudson/init/impl/GroovyInitScriptTest/errorsHandled.zip
0 → 100644
浏览文件 @
68842017
此差异由.gitattributes 抑制。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录