Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
733f0911
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,发现更多精彩内容 >>
提交
733f0911
编写于
4月 29, 2015
作者:
O
Oliver Gondža
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove logs after deleting the computer
上级
ca3b1db4
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
61 addition
and
0 deletion
+61
-0
core/src/main/java/hudson/slaves/SlaveComputer.java
core/src/main/java/hudson/slaves/SlaveComputer.java
+6
-0
test/src/test/java/hudson/model/ComputerTest.java
test/src/test/java/hudson/model/ComputerTest.java
+55
-0
未找到文件。
core/src/main/java/hudson/slaves/SlaveComputer.java
浏览文件 @
733f0911
...
...
@@ -655,6 +655,12 @@ public class SlaveComputer extends Computer {
super
.
kill
();
closeChannel
();
IOUtils
.
closeQuietly
(
log
);
try
{
Util
.
deleteRecursive
(
getLogFile
().
getParentFile
());
}
catch
(
IOException
ex
)
{
logger
.
log
(
Level
.
WARNING
,
"Unable to delete slave logs"
,
ex
);
}
}
public
RetentionStrategy
getRetentionStrategy
()
{
...
...
test/src/test/java/hudson/model/ComputerTest.java
0 → 100644
浏览文件 @
733f0911
/*
* The MIT License
*
* Copyright (c) 2015 Red Hat, Inc.
*
* 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.model
;
import
static
org
.
junit
.
Assert
.*;
import
java.io.File
;
import
jenkins.model.Jenkins
;
import
hudson.slaves.DumbSlave
;
import
org.junit.Rule
;
import
org.junit.Test
;
import
org.jvnet.hudson.test.JenkinsRule
;
public
class
ComputerTest
{
@Rule
public
JenkinsRule
j
=
new
JenkinsRule
();
@Test
public
void
discardLogsAfterDeletion
()
throws
Exception
{
DumbSlave
delete
=
j
.
createOnlineSlave
(
Jenkins
.
getInstance
().
getLabelAtom
(
"delete"
));
DumbSlave
keep
=
j
.
createOnlineSlave
(
Jenkins
.
getInstance
().
getLabelAtom
(
"keep"
));
File
logFile
=
delete
.
toComputer
().
getLogFile
();
assertTrue
(
logFile
.
exists
());
Jenkins
.
getInstance
().
removeNode
(
delete
);
assertFalse
(
"Slave log should be deleted"
,
logFile
.
exists
());
assertFalse
(
"Slave log directory should be deleted"
,
logFile
.
getParentFile
().
exists
());
assertTrue
(
"Slave log should be kept"
,
keep
.
toComputer
().
getLogFile
().
exists
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录