summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMartin Ritchie <ritchiem@apache.org>2009-09-30 15:58:47 +0000
committerMartin Ritchie <ritchiem@apache.org>2009-09-30 15:58:47 +0000
commit1a35336924f83669ec07248f20bd359b927f414d (patch)
treeec91497db52f425809ba6646070447308fe06760 /java
parent4c83ded125ecf99c71f2cf2de2b68711db582a53 (diff)
downloadqpid-python-1a35336924f83669ec07248f20bd359b927f414d.tar.gz
Correct order of log4j entries so our parser doesn't print an error
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@820322 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/module.xml1
-rw-r--r--java/test-profiles/default.testprofile1
-rw-r--r--java/test-profiles/log4j-test.xml2
3 files changed, 3 insertions, 1 deletions
diff --git a/java/module.xml b/java/module.xml
index 188b347dc5..5796af928a 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -261,6 +261,7 @@
<jvmarg value="${jvm.args}"/>
<sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
+ <sysproperty key="amqj.server.logging.level" value="${amqj.server.logging.level}"/>
<sysproperty key="amqj.protocol.logging.level" value="${amqj.protocol.logging.level}"/>
<sysproperty key="log4j.debug" value="${log4j.debug}"/>
<sysproperty key="root.logging.level" value="${root.logging.level}"/>
diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile
index 63ad03f08b..28127e5c4c 100644
--- a/java/test-profiles/default.testprofile
+++ b/java/test-profiles/default.testprofile
@@ -11,6 +11,7 @@ max_prefetch=1000
log=debug
amqj.logging.level=${log}
+amqj.server.logging.level=${log}
amqj.protocol.logging.level=${log}
root.logging.level=warn
log4j.configuration=file:///${test.profiles}/log4j-test.xml
diff --git a/java/test-profiles/log4j-test.xml b/java/test-profiles/log4j-test.xml
index ec1efdbfdc..2d77942a81 100644
--- a/java/test-profiles/log4j-test.xml
+++ b/java/test-profiles/log4j-test.xml
@@ -29,10 +29,10 @@
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
<appender name="console" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out"/>
+ <param name="ImmediateFlush" value="true"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%t %d %p [%c{4}] %m%n"/>
</layout>
- <param name="ImmediateFlush" value="true"/>
</appender>
<logger name="org.apache.qpid">