Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
d611b6d1
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,发现更多精彩内容 >>
未验证
提交
d611b6d1
编写于
8月 07, 2020
作者:
S
StefanSpieker
提交者:
GitHub
8月 07, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removed deprecated ProcessTreeKiller (#4874)
上级
30e46ee8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
121 deletion
+4
-121
core/src/main/java/hudson/util/ProcessTree.java
core/src/main/java/hudson/util/ProcessTree.java
+2
-4
core/src/main/java/hudson/util/ProcessTreeKiller.java
core/src/main/java/hudson/util/ProcessTreeKiller.java
+0
-115
test/src/test/java/hudson/util/ProcessTreeTest.java
test/src/test/java/hudson/util/ProcessTreeTest.java
+2
-2
未找到文件。
core/src/main/java/hudson/util/ProcessTree.java
浏览文件 @
d611b6d1
...
...
@@ -1979,9 +1979,7 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
* This feature involves some native code, so we are allowing the user to disable this
* in case there's a fatal problem.
*
* <p>
* This property supports two names for a compatibility reason.
*/
public
static
boolean
enabled
=
!
SystemProperties
.
getBoolean
(
ProcessTreeKiller
.
class
.
getName
()+
"
.disable"
)
&&
!
SystemProperties
.
getBoolean
(
ProcessTree
.
class
.
getName
()+
".disable"
);
public
static
boolean
enabled
=
!
SystemProperties
.
getBoolean
(
"hudson.util.ProcessTreeKiller
.disable"
)
&&
!
SystemProperties
.
getBoolean
(
ProcessTree
.
class
.
getName
()+
".disable"
);
}
core/src/main/java/hudson/util/ProcessTreeKiller.java
已删除
100644 → 0
浏览文件 @
30e46ee8
/*
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
*
* 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
;
import
hudson.EnvVars
;
import
hudson.util.ProcessTree.OSProcess
;
import
java.util.Map
;
/**
* Kills a process tree to clean up the mess left by a build.
*
* @author Kohsuke Kawaguchi
* @since 1.201
* @deprecated as of 1.315. Use {@link ProcessTree}.
*/
@Deprecated
public
final
class
ProcessTreeKiller
{
/**
* Short for {@code kill(proc,null)}
*
* @deprecated Use {@link OSProcess#killRecursively()}
*/
@Deprecated
public
void
kill
(
Process
proc
)
throws
InterruptedException
{
kill
(
proc
,
null
);
}
/**
* In addition to what {@link #kill(Process)} does, also tries to
* kill all the daemon processes launched.
*
* <p>
* Kills the given process (like {@link Process#destroy()}
* but also attempts to kill descendant processes created from the given
* process.
*
* <p>
* In addition, optionally perform "search and destroy" based on environment
* variables. In this method, the method is given a
* "model environment variables", which is a list of environment variables
* and their values that are characteristic to the launched process.
* The implementation is expected to find processes
* in the system that inherit these environment variables, and kill
* them all. This is suitable for locating daemon processes
* that cannot be tracked by the regular ancestor/descendant relationship.
*
* <p>
* The implementation is obviously OS-dependent.
*
* @param proc
* Process to be killed recursively. Can be null.
* @param modelEnvVars
* If non-null, search-and-destroy will be performed.
* @deprecated Use {@link ProcessTree#killAll(Map)} and {@link OSProcess#killRecursively()}
*/
@Deprecated
public
void
kill
(
Process
proc
,
Map
<
String
,
String
>
modelEnvVars
)
throws
InterruptedException
{
ProcessTree
pt
=
ProcessTree
.
get
();
if
(
proc
!=
null
)
pt
.
get
(
proc
).
killRecursively
();
if
(
modelEnvVars
!=
null
)
pt
.
killAll
(
modelEnvVars
);
}
/**
* Short for {@code kill(null,modelEnvVars)}
* @deprecated Use {@link ProcessTree#killAll(Map)}
*/
@Deprecated
public
void
kill
(
Map
<
String
,
String
>
modelEnvVars
)
throws
InterruptedException
{
kill
(
null
,
modelEnvVars
);
}
/**
* Creates a magic cookie that can be used as the model environment variable
* when we later kill the processes.
*
* @deprecated Use {@link EnvVars#createCookie()}
*/
@Deprecated
public
static
EnvVars
createCookie
()
{
return
EnvVars
.
createCookie
();
}
/**
* Gets the {@link ProcessTreeKiller} suitable for the current system
* that JVM runs in, or in the worst case return the default one
* that's not capable of killing descendants at all.
*/
public
static
ProcessTreeKiller
get
()
{
return
new
ProcessTreeKiller
();
}
}
test/src/test/java/hudson/util/ProcessTree
Killer
Test.java
→
test/src/test/java/hudson/util/ProcessTreeTest.java
浏览文件 @
d611b6d1
...
...
@@ -31,14 +31,14 @@ import org.jvnet.hudson.test.TestExtension;
import
com.google.common.collect.ImmutableMap
;
public
class
ProcessTree
Killer
Test
{
public
class
ProcessTreeTest
{
@Rule
public
JenkinsRule
j
=
new
JenkinsRule
();
private
Process
process
;
@After
public
void
tearDown
()
throws
Exception
{
public
void
tearDown
()
{
ProcessTree
.
vetoersExist
=
null
;
if
(
null
!=
process
)
process
.
destroy
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录