Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
bf2e0ffb
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
bf2e0ffb
编写于
3月 20, 2013
作者:
M
mchung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8006104: Improve tests to test ".useParentHandlers" property set in the logging configuration
Reviewed-by: alanb
上级
8078c4c1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
5 deletion
+35
-5
test/java/util/logging/CustomLogManager.java
test/java/util/logging/CustomLogManager.java
+34
-4
test/java/util/logging/CustomLogManagerTest.java
test/java/util/logging/CustomLogManagerTest.java
+1
-1
未找到文件。
test/java/util/logging/CustomLogManager.java
浏览文件 @
bf2e0ffb
...
...
@@ -43,6 +43,20 @@ public class CustomLogManager extends LogManager {
INSTANCE
=
this
;
}
private
boolean
useParentHandlers
(
String
loggerName
)
{
String
s
=
props
.
getProperty
(
loggerName
+
".useParentHandlers"
);
if
(
s
==
null
)
return
true
;
// default is true
s
=
s
.
toLowerCase
();
if
(
s
.
equals
(
"true"
)
||
s
.
equals
(
"1"
))
{
return
true
;
}
else
if
(
s
.
equals
(
"false"
)
||
s
.
equals
(
"0"
))
{
return
false
;
}
return
true
;
}
public
synchronized
boolean
addLogger
(
Logger
logger
)
{
String
name
=
logger
.
getName
();
if
(
namedLoggers
.
containsKey
(
name
))
{
...
...
@@ -57,6 +71,9 @@ public class CustomLogManager extends LogManager {
if
(
props
.
get
(
name
+
".handlers"
)
!=
null
&&
logger
.
getHandlers
().
length
==
0
)
{
logger
.
addHandler
(
new
CustomHandler
());
}
if
(!
useParentHandlers
(
name
))
{
logger
.
setUseParentHandlers
(
false
);
}
// add parent loggers
int
ix
=
1
;
for
(;;)
{
...
...
@@ -72,7 +89,10 @@ public class CustomLogManager extends LogManager {
//
// The test doesn't set the parent for simplicity.
if
(!
namedLoggers
.
containsKey
(
pname
))
{
Logger
.
getLogger
(
pname
);
Logger
parent
=
Logger
.
getLogger
(
pname
);
if
(!
useParentHandlers
(
pname
))
{
parent
.
setUseParentHandlers
(
false
);
}
}
}
ix
=
ix2
+
1
;
...
...
@@ -110,14 +130,16 @@ public class CustomLogManager extends LogManager {
props
.
put
(
"CustomLogManager$CustomHandler.level"
,
"WARNING"
);
props
.
put
(
".handlers"
,
"CustomLogManager$CustomHandler"
);
props
.
put
(
"org.foo.bar.level"
,
"SEVERE"
);
props
.
put
(
"org.foo.bar.useParentHandlers"
,
"true"
);
props
.
put
(
"org.foo.handlers"
,
"CustomLogManager$CustomHandler"
);
props
.
put
(
"org.foo.useParentHandlers"
,
"false"
);
props
.
put
(
"org.openjdk.level"
,
"SEVERE"
);
props
.
put
(
"org.openjdk.handlers"
,
"CustomLogManager$CustomHandler"
);
props
.
put
(
"org.openjdk.core.level"
,
"INFO"
);
props
.
put
(
"org.openjdk.core.useParentHandlers"
,
"false"
);
return
props
;
}
public
static
void
checkLogger
(
String
name
)
{
checkLogger
(
name
,
null
);
}
...
...
@@ -127,10 +149,11 @@ public class CustomLogManager extends LogManager {
if
(
logger
==
null
)
{
throw
new
RuntimeException
(
"Logger \""
+
name
+
"\" not exist"
);
}
System
.
out
.
format
(
"Logger \"%s\" level=%s handlers=%s resourcebundle=%s%n"
,
System
.
out
.
format
(
"Logger \"%s\" level=%s handlers=%s resourcebundle=%s
useParentHandlers=%s
%n"
,
name
,
logger
.
getLevel
(),
Arrays
.
toString
(
logger
.
getHandlers
()),
logger
.
getResourceBundleName
());
logger
.
getResourceBundleName
(),
logger
.
getUseParentHandlers
());
String
rb
=
logger
.
getResourceBundleName
();
if
(
rb
!=
resourceBundleName
&&
(
rb
==
null
||
rb
.
equals
(
resourceBundleName
)))
{
throw
new
RuntimeException
(
"Logger \""
+
name
+
...
...
@@ -150,6 +173,13 @@ public class CustomLogManager extends LogManager {
throw
new
RuntimeException
(
"Logger \""
+
name
+
"\" unexpected handler: "
+
Arrays
.
toString
(
handlers
));
}
String
s
=
INSTANCE
.
getProperty
(
name
+
".useParentHandlers"
);
boolean
uph
=
(
s
!=
null
&&
s
.
equals
(
"false"
))
?
false
:
true
;
if
(
logger
.
getUseParentHandlers
()
!=
uph
)
{
throw
new
RuntimeException
(
"Logger \""
+
name
+
"\" unexpected useParentHandlers: "
+
logger
.
getUseParentHandlers
());
}
checkParents
(
name
);
}
...
...
test/java/util/logging/CustomLogManagerTest.java
浏览文件 @
bf2e0ffb
...
...
@@ -29,7 +29,7 @@ import sun.util.logging.PlatformLogger;
/*
* @test
* @bug 8005615
* @bug 8005615
8006104
* @summary Add loggers to custom log manager
*
* @compile -XDignore.symbol.file CustomLogManagerTest.java CustomLogManager.java
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录