Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
a82238b8
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,发现更多精彩内容 >>
提交
a82238b8
编写于
3月 26, 2016
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplified by using instance methods
上级
1bc7f621
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
13 deletion
+7
-13
core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
...c/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
+2
-6
core/src/main/java/jenkins/model/Uptime.java
core/src/main/java/jenkins/model/Uptime.java
+2
-2
core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
...c/main/java/jenkins/security/RekeySecretAdminMonitor.java
+3
-5
未找到文件。
core/src/main/java/hudson/diagnosis/NullIdDescriptorMonitor.java
浏览文件 @
a82238b8
...
@@ -60,7 +60,8 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor {
...
@@ -60,7 +60,8 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor {
return
Collections
.
unmodifiableList
(
problems
);
return
Collections
.
unmodifiableList
(
problems
);
}
}
private
void
verify
()
{
@Initializer
(
after
=
EXTENSIONS_AUGMENTED
)
public
void
verify
()
{
Jenkins
h
=
Jenkins
.
getInstance
();
Jenkins
h
=
Jenkins
.
getInstance
();
for
(
Descriptor
d
:
h
.
getExtensionList
(
Descriptor
.
class
))
{
for
(
Descriptor
d
:
h
.
getExtensionList
(
Descriptor
.
class
))
{
PluginWrapper
p
=
h
.
getPluginManager
().
whichPlugin
(
d
.
getClass
());
PluginWrapper
p
=
h
.
getPluginManager
().
whichPlugin
(
d
.
getClass
());
...
@@ -81,10 +82,5 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor {
...
@@ -81,10 +82,5 @@ public class NullIdDescriptorMonitor extends AdministrativeMonitor {
}
}
}
}
@Initializer
(
after
=
EXTENSIONS_AUGMENTED
)
public
static
void
verifyId
()
{
AdministrativeMonitor
.
all
().
get
(
NullIdDescriptorMonitor
.
class
).
verify
();
}
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
NullIdDescriptorMonitor
.
class
.
getName
());
private
static
final
Logger
LOGGER
=
Logger
.
getLogger
(
NullIdDescriptorMonitor
.
class
.
getName
());
}
}
core/src/main/java/jenkins/model/Uptime.java
浏览文件 @
a82238b8
...
@@ -27,7 +27,7 @@ public class Uptime {
...
@@ -27,7 +27,7 @@ public class Uptime {
}
}
@Initializer
(
after
=
InitMilestone
.
JOB_LOADED
)
@Initializer
(
after
=
InitMilestone
.
JOB_LOADED
)
public
static
void
init
()
{
public
void
init
()
{
ExtensionList
.
lookup
(
Uptime
.
class
).
get
(
0
).
startTime
=
System
.
currentTimeMillis
();
startTime
=
System
.
currentTimeMillis
();
}
}
}
}
core/src/main/java/jenkins/security/RekeySecretAdminMonitor.java
浏览文件 @
a82238b8
...
@@ -113,13 +113,11 @@ public class RekeySecretAdminMonitor extends AsynchronousAdministrativeMonitor i
...
@@ -113,13 +113,11 @@ public class RekeySecretAdminMonitor extends AsynchronousAdministrativeMonitor i
@Initializer
(
fatal
=
false
,
after
=
InitMilestone
.
PLUGINS_STARTED
,
before
=
InitMilestone
.
EXTENSIONS_AUGMENTED
)
@Initializer
(
fatal
=
false
,
after
=
InitMilestone
.
PLUGINS_STARTED
,
before
=
InitMilestone
.
EXTENSIONS_AUGMENTED
)
// as early as possible, but this needs to be late enough that the ConfidentialStore is available
// as early as possible, but this needs to be late enough that the ConfidentialStore is available
public
static
void
scanOnReboot
()
throws
InterruptedException
,
IOException
,
GeneralSecurityException
{
public
void
scanOnReboot
()
throws
InterruptedException
,
IOException
,
GeneralSecurityException
{
RekeySecretAdminMonitor
m
=
new
RekeySecretAdminMonitor
();
// throw-away instance
FileBoolean
flag
=
scanOnBoot
;
FileBoolean
flag
=
m
.
scanOnBoot
;
if
(
flag
.
isOn
())
{
if
(
flag
.
isOn
())
{
flag
.
off
();
flag
.
off
();
m
.
start
(
false
).
join
();
start
(
false
).
join
();
// block the boot until the rewrite process is complete
// block the boot until the rewrite process is complete
// don't let the failure in RekeyThread block Jenkins boot.
// don't let the failure in RekeyThread block Jenkins boot.
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录