Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
273287aa
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,发现更多精彩内容 >>
提交
273287aa
编写于
11月 18, 2012
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
exposed whether a restart is needed
上级
62a23114
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
3 deletion
+36
-3
core/src/main/java/hudson/model/UpdateCenter.java
core/src/main/java/hudson/model/UpdateCenter.java
+35
-3
core/src/main/java/hudson/model/UpdateSite.java
core/src/main/java/hudson/model/UpdateSite.java
+1
-0
未找到文件。
core/src/main/java/hudson/model/UpdateCenter.java
浏览文件 @
273287aa
...
...
@@ -113,7 +113,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
private
static
final
String
UPDATE_CENTER_URL
=
System
.
getProperty
(
UpdateCenter
.
class
.
getName
()+
".updateCenterUrl"
,
"http://updates.jenkins-ci.org/"
);
/**
* {@link
#getId
} of the default update site.
* {@link
plain UpdateSite#getId() ID
} of the default update site.
* @since 1.483
*/
public
static
final
String
ID_DEFAULT
=
"default"
;
...
...
@@ -151,10 +151,27 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
*/
private
UpdateCenterConfiguration
config
;
private
boolean
requiresRestart
;
public
UpdateCenter
()
{
configure
(
new
UpdateCenterConfiguration
());
}
/**
* If any of the executed {@link UpdateCenterJob}s requires a restart
* to take effect, this method returns true.
*
* <p>
* This doesn't necessarily mean the user has scheduled or initiated
* the restart operation.
*
* @see #isRestartScheduled()
*/
@Exported
public
boolean
isRestartRequiredForCompletion
()
{
return
requiresRestart
;
}
public
Api
getApi
()
{
return
new
Api
(
this
);
}
...
...
@@ -384,8 +401,10 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
}
/**
* Checks if restart is scheduled
*
* Checks if the restart operation is scheduled
* (which means in near future Jenkins will restart by itself)
*
* @see #isRestartRequiredForCompletion()
*/
public
boolean
isRestartScheduled
()
{
for
(
UpdateCenterJob
job
:
getJobs
())
{
...
...
@@ -1042,6 +1061,7 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
}
catch
(
InstallationStatus
e
)
{
status
=
e
;
if
(
status
.
isSuccess
())
onSuccess
();
requiresRestart
|=
status
.
requiresRestart
();
}
catch
(
Throwable
e
)
{
LOGGER
.
log
(
Level
.
SEVERE
,
"Failed to install "
+
getName
(),
e
);
status
=
new
Failure
(
e
);
...
...
@@ -1091,6 +1111,13 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
public
final
String
getType
()
{
return
getClass
().
getSimpleName
();
}
/**
* Indicates that a restart is needed to complete the tasks.
*/
public
boolean
requiresRestart
()
{
return
false
;
}
}
/**
...
...
@@ -1123,6 +1150,11 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
public
String
getMessage
()
{
return
message
.
toString
();
}
@Override
public
boolean
requiresRestart
()
{
return
true
;
}
}
/**
...
...
core/src/main/java/hudson/model/UpdateSite.java
浏览文件 @
273287aa
...
...
@@ -673,6 +673,7 @@ public class UpdateSite {
* @param dynamicLoad
* If true, the plugin will be dynamically loaded into this Jenkins. If false,
* the plugin will only take effect after the reboot.
* See {@link UpdateCenter#isRestartRequiredForCompletion()}
*/
public
Future
<
UpdateCenterJob
>
deploy
(
boolean
dynamicLoad
)
{
Jenkins
.
getInstance
().
checkPermission
(
Jenkins
.
ADMINISTER
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录