Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
9075d827
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,发现更多精彩内容 >>
提交
9075d827
编写于
6月 09, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rotate the slave log files instead of deleting them.
上级
5f53febe
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
107 addition
and
2 deletion
+107
-2
changelog.html
changelog.html
+2
-0
core/src/main/java/hudson/slaves/SlaveComputer.java
core/src/main/java/hudson/slaves/SlaveComputer.java
+2
-1
core/src/main/java/hudson/util/io/ReopenableFileOutputStream.java
.../main/java/hudson/util/io/ReopenableFileOutputStream.java
+1
-1
core/src/main/java/hudson/util/io/ReopenableRotatingFileOutputStream.java
...va/hudson/util/io/ReopenableRotatingFileOutputStream.java
+70
-0
core/src/test/java/hudson/util/io/ReopenableRotatingFileOutputStreamTest.java
...udson/util/io/ReopenableRotatingFileOutputStreamTest.java
+32
-0
未找到文件。
changelog.html
浏览文件 @
9075d827
...
...
@@ -79,6 +79,8 @@ Upcoming changes</a>
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/119"
>
pull request #119
</a>
)
<li
class=
rfe
>
Plugins can now override where jobs are executed.
<li
class=
rfe
>
Rotate the slave log files instead of deleting them.
<li
class=
rfe
>
Added a mechanism to control the XML parser behaviour
(
<a
href=
"https://github.com/jenkinsci/jenkins/pull/67"
>
pull request #67
</a>
)
...
...
core/src/main/java/hudson/slaves/SlaveComputer.java
浏览文件 @
9075d827
...
...
@@ -24,6 +24,7 @@
package
hudson.slaves
;
import
hudson.model.*
;
import
hudson.util.io.ReopenableRotatingFileOutputStream
;
import
jenkins.model.Jenkins.MasterComputer
;
import
hudson.remoting.Channel
;
import
hudson.remoting.VirtualChannel
;
...
...
@@ -115,7 +116,7 @@ public class SlaveComputer extends Computer {
public
SlaveComputer
(
Slave
slave
)
{
super
(
slave
);
this
.
log
=
new
Reopenable
FileOutputStream
(
getLogFile
()
);
this
.
log
=
new
Reopenable
RotatingFileOutputStream
(
getLogFile
(),
10
);
this
.
taskListener
=
new
StreamTaskListener
(
log
);
}
...
...
core/src/main/java/hudson/util/io/ReopenableFileOutputStream.java
浏览文件 @
9075d827
...
...
@@ -41,7 +41,7 @@ import java.io.OutputStream;
* @author Kohsuke Kawaguchi
*/
public
class
ReopenableFileOutputStream
extends
OutputStream
{
pr
ivate
final
File
out
;
pr
otected
final
File
out
;
private
OutputStream
current
;
private
boolean
appendOnNextOpen
=
false
;
...
...
core/src/main/java/hudson/util/io/ReopenableRotatingFileOutputStream.java
0 → 100644
浏览文件 @
9075d827
/*
* The MIT License
*
* Copyright (c) 2011, CloudBees, 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.util.io
;
import
java.io.File
;
import
java.io.IOException
;
/**
* {@link ReopenableFileOutputStream} that does log rotation upon rewind.
*
* @author Kohsuke Kawaguchi
* @since 1.416
*/
public
class
ReopenableRotatingFileOutputStream
extends
ReopenableFileOutputStream
{
/**
* Number of log files to keep.
*/
private
final
int
size
;
public
ReopenableRotatingFileOutputStream
(
File
out
,
int
size
)
{
super
(
out
);
this
.
size
=
size
;
}
protected
File
getNumberedFileName
(
int
n
)
{
if
(
n
==
0
)
return
out
;
return
new
File
(
out
.
getPath
()+
"."
+
n
);
}
@Override
public
void
rewind
()
throws
IOException
{
super
.
rewind
();
for
(
int
i
=
size
-
1
;
i
>=
0
;
i
--)
{
File
fi
=
getNumberedFileName
(
i
);
if
(
fi
.
exists
())
{
fi
.
renameTo
(
getNumberedFileName
(
i
+
1
));
}
}
}
/**
* Deletes all the log files, including rotated files.
*/
public
void
deleteAll
()
{
for
(
int
i
=
0
;
i
<=
size
;
i
++)
{
getNumberedFileName
(
i
).
delete
();
}
}
}
core/src/test/java/hudson/util/io/ReopenableRotatingFileOutputStreamTest.java
0 → 100644
浏览文件 @
9075d827
package
hudson.util.io
;
import
hudson.FilePath
;
import
junit.framework.TestCase
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
/**
* @author Kohsuke Kawaguchi
*/
public
class
ReopenableRotatingFileOutputStreamTest
extends
TestCase
{
public
void
testRotation
()
throws
IOException
{
File
base
=
File
.
createTempFile
(
"test"
,
"log"
);
ReopenableRotatingFileOutputStream
os
=
new
ReopenableRotatingFileOutputStream
(
base
,
3
);
PrintWriter
w
=
new
PrintWriter
(
os
,
true
);
for
(
int
i
=
0
;
i
<=
4
;
i
++)
{
w
.
println
(
"Content"
+
i
);
os
.
rewind
();
}
w
.
println
(
"Content5"
);
assertEquals
(
"Content5"
,
new
FilePath
(
base
).
readToString
().
trim
());
assertEquals
(
"Content4"
,
new
FilePath
(
new
File
(
base
.
getPath
()
+
".1"
)).
readToString
().
trim
());
assertEquals
(
"Content3"
,
new
FilePath
(
new
File
(
base
.
getPath
()
+
".2"
)).
readToString
().
trim
());
assertEquals
(
"Content2"
,
new
FilePath
(
new
File
(
base
.
getPath
()
+
".3"
)).
readToString
().
trim
());
assertFalse
(
new
File
(
base
.
getPath
()
+
".4"
).
exists
());
os
.
deleteAll
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录