Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
c8c5e52d
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c8c5e52d
编写于
11月 06, 2013
作者:
J
Joram Barrez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix for failing Jenkins
上级
2a444277
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
39 deletion
+37
-39
modules/activiti-engine/src/test/java/org/activiti/engine/test/logging/mdc/MDCLoggingTest.java
.../org/activiti/engine/test/logging/mdc/MDCLoggingTest.java
+36
-38
modules/activiti-engine/src/test/resources/log4j.properties
modules/activiti-engine/src/test/resources/log4j.properties
+1
-1
未找到文件。
modules/activiti-engine/src/test/java/org/activiti/engine/test/logging/mdc/MDCLoggingTest.java
浏览文件 @
c8c5e52d
...
@@ -15,41 +15,40 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
...
@@ -15,41 +15,40 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
MemoryLogAppender
console
=
new
MemoryLogAppender
();
MemoryLogAppender
console
=
new
MemoryLogAppender
();
List
<
Appender
>
appenders
=
null
;
List
<
Appender
>
appenders
=
null
;
private
void
setCustomLogger
()
{
private
void
setCustomLogger
()
{
String
PATTERN
=
"Modified Log *** ProcessDefinitionId=%X{mdcProcessDefinitionID} executionId=%X{mdcExecutionId} mdcProcessInstanceID=%X{mdcProcessInstanceID} mdcBusinessKey=%X{mdcBusinessKey} mdcTaskId=%X{mdcTaskId} %m%n"
;
String
PATTERN
=
"Modified Log *** ProcessDefinitionId=%X{mdcProcessDefinitionID} executionId=%X{mdcExecutionId} mdcProcessInstanceID=%X{mdcProcessInstanceID} mdcBusinessKey=%X{mdcBusinessKey} mdcTaskId=%X{mdcTaskId} %m%n"
;
console
.
setLayout
(
new
PatternLayout
(
PATTERN
));
console
.
setLayout
(
new
PatternLayout
(
PATTERN
));
console
.
setThreshold
(
Level
.
INFO
);
console
.
setThreshold
(
Level
.
DEBUG
);
console
.
activateOptions
();
console
.
activateOptions
();
console
.
setName
(
"MemoryAppender"
);
console
.
setName
(
"MemoryAppender"
);
appenders
=
new
ArrayList
<
Appender
>();
appenders
=
new
ArrayList
<
Appender
>();
Enumeration
<?>
appendersEnum
=
Logger
.
getRootLogger
().
getAllAppenders
();
Enumeration
<?>
appendersEnum
=
Logger
.
getRootLogger
().
getAllAppenders
();
while
(
appendersEnum
.
hasMoreElements
())
{
while
(
appendersEnum
.
hasMoreElements
())
{
Appender
object
=
(
Appender
)
appendersEnum
.
nextElement
();
Appender
object
=
(
Appender
)
appendersEnum
.
nextElement
();
appenders
.
add
(
object
);
appenders
.
add
(
object
);
}
}
removeAppenders
();
removeAppenders
();
Logger
.
getRootLogger
().
addAppender
(
console
);
Logger
.
getRootLogger
().
addAppender
(
console
);
}
}
private
void
removeAppenders
()
{
private
void
removeAppenders
()
{
Enumeration
<
?
>
appendersEnum
=
Logger
.
getRootLogger
().
getAllAppenders
();
Enumeration
<?
>
appendersEnum
=
Logger
.
getRootLogger
().
getAllAppenders
();
while
(
appendersEnum
.
hasMoreElements
())
{
while
(
appendersEnum
.
hasMoreElements
())
{
Appender
object
=
(
Appender
)
appendersEnum
.
nextElement
();
Appender
object
=
(
Appender
)
appendersEnum
.
nextElement
();
Logger
.
getRootLogger
().
removeAppender
(
object
);
Logger
.
getRootLogger
().
removeAppender
(
object
);
}
}
}
}
private
void
restoreLoggers
()
{
private
void
restoreLoggers
()
{
removeAppenders
();
removeAppenders
();
for
(
Appender
appender
:
appenders
)
{
for
(
Appender
appender
:
appenders
)
{
Logger
.
getRootLogger
().
addAppender
(
appender
);
Logger
.
getRootLogger
().
addAppender
(
appender
);
}
}
}
}
...
@@ -61,28 +60,27 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
...
@@ -61,28 +60,27 @@ public class MDCLoggingTest extends PluggableActivitiTestCase {
runtimeService
.
startProcessInstanceByKey
(
"testLoggerProcess"
);
runtimeService
.
startProcessInstanceByKey
(
"testLoggerProcess"
);
fail
(
"Expected exception"
);
fail
(
"Expected exception"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
// expected exception
// expected exception
}
}
String
messages
=
console
.
toString
();
String
messages
=
console
.
toString
();
System
.
out
.
println
(
"---:"
+
messages
);
assertTrue
(
messages
.
contains
(
"ProcessDefinitionId="
+
TestService
.
processDefinitionId
));
assertTrue
(
messages
.
contains
(
"ProcessDefinitionId="
assertTrue
(
messages
.
contains
(
+
TestService
.
processDefinitionId
));
"executionId="
+
TestService
.
executionId
));
assertTrue
(
messages
.
contains
(
"executionId="
+
TestService
.
executionId
));
assertTrue
(
messages
.
contains
(
assertTrue
(
messages
.
contains
(
"mdcProcessInstanceID="
"mdcProcessInstanceID="
+
TestService
.
processInstanceId
));
+
TestService
.
processInstanceId
));
assertTrue
(
messages
.
contains
(
assertTrue
(
messages
.
contains
(
"mdcBusinessKey="
"mdcBusinessKey="
+
(
TestService
.
businessKey
==
null
?
""
+
(
TestService
.
businessKey
==
null
?
""
:
TestService
.
businessKey
)));
:
TestService
.
businessKey
)));
console
.
clear
();
console
.
clear
();
restoreLoggers
();
restoreLoggers
();
try
{
try
{
runtimeService
.
startProcessInstanceByKey
(
"testLoggerProcess"
);
runtimeService
.
startProcessInstanceByKey
(
"testLoggerProcess"
);
fail
(
"Expected exception"
);
fail
(
"Expected exception"
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
// expected exception
// expected exception
}
}
assertFalse
(
console
.
toString
().
contains
(
assertFalse
(
console
.
toString
().
contains
(
"ProcessDefinitionId="
+
TestService
.
processDefinitionId
));
"ProcessDefinitionId="
+
TestService
.
processDefinitionId
));
...
...
modules/activiti-engine/src/test/resources/log4j.properties
浏览文件 @
c8c5e52d
log4j.rootLogger
=
INFO
, CA
log4j.rootLogger
=
DEBUG
, CA
# ConsoleAppender
# ConsoleAppender
log4j.appender.CA
=
org.apache.log4j.ConsoleAppender
log4j.appender.CA
=
org.apache.log4j.ConsoleAppender
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录