You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/07/16 17:57:28 UTC
svn commit: r677319 - in /incubator/qpid/trunk/qpid/java: ./
client/src/main/java/org/apache/qpid/client/protocol/ common/src/main/java/
Author: ritchiem
Date: Wed Jul 16 08:57:26 2008
New Revision: 677319
URL: http://svn.apache.org/viewvc?rev=677319&view=rev
Log:
Update to the logging to ensure QpidTestCase is always logged and standardized the protocol output format between 0-8/0-9 and 0-10
Added:
incubator/qpid/trunk/qpid/java/default-longrunning.testprofile
- copied, changed from r677263, incubator/qpid/trunk/qpid/java/default.testprofile
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties
incubator/qpid/trunk/qpid/java/cpp.async.testprofile
incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
incubator/qpid/trunk/qpid/java/cpp.testprofile
incubator/qpid/trunk/qpid/java/default.testprofile
incubator/qpid/trunk/qpid/java/log4j-test.xml
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Wed Jul 16 08:57:26 2008
@@ -488,7 +488,7 @@
{
if (PROTOCOL_DEBUG)
{
- _protocolLogger.info("Recv:"+message);
+ _protocolLogger.info("RECV: [%s] %s", this, message);
}
if(message instanceof AMQFrame)
@@ -574,7 +574,7 @@
{
if (PROTOCOL_DEBUG)
{
- _protocolLogger.info("Send:"+message);
+ _protocolLogger.debug("SEND: [%s] %s", this, message);
}
final long sentMessages = _messagesOut++;
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/log4j.properties Wed Jul 16 08:57:26 2008
@@ -23,6 +23,9 @@
log4j.additivity.qpid.protocol=false
log4j.logger.org.apache.qpid=${amqj.logging.level}, console
log4j.additivity.org.apache.qpid=false
+log4j.logger.org.apache.qpidity=${amqj.logging.level}, console
+log4j.additivity.org.apache.qpidity=false
+
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.Threshold=all
Modified: incubator/qpid/trunk/qpid/java/cpp.async.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.async.testprofile?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.async.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.async.testprofile Wed Jul 16 08:57:26 2008
@@ -8,8 +8,10 @@
test.excludesfile=${project.root}/010ExcludeList-store
log=info
amqj.logging.level=$log
+amqj.protocol.logging.level=$log
root.logging.level=$log
log4j.configuration=file://${project.root}/log4j-test.xml
+log4j.debug=false
test.fork=no
test.mem=512M
test=*Test
Modified: incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.sync.testprofile?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.sync.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.sync.testprofile Wed Jul 16 08:57:26 2008
@@ -8,8 +8,10 @@
test.excludesfile=${project.root}/010ExcludeList-store
log=info
amqj.logging.level=$log
+amqj.protocol.logging.level=$log
root.logging.level=$log
log4j.configuration=file://${project.root}/log4j-test.xml
+log4j.debug=false
test.fork=no
test.mem=512M
test=*Test
Modified: incubator/qpid/trunk/qpid/java/cpp.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.testprofile?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.testprofile Wed Jul 16 08:57:26 2008
@@ -8,8 +8,10 @@
test.excludesfile=${project.root}/010ExcludeList
log=info
amqj.logging.level=$log
+amqj.protocol.logging.level=$log
root.logging.level=$log
log4j.configuration=file://${project.root}/log4j-test.xml
+log4j.debug=false
test.fork=no
test.mem=512M
test=*Test
Copied: incubator/qpid/trunk/qpid/java/default-longrunning.testprofile (from r677263, incubator/qpid/trunk/qpid/java/default.testprofile)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/default-longrunning.testprofile?p2=incubator/qpid/trunk/qpid/java/default-longrunning.testprofile&p1=incubator/qpid/trunk/qpid/java/default.testprofile&r1=677263&r2=677319&rev=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/default.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/default-longrunning.testprofile Wed Jul 16 08:57:26 2008
@@ -4,11 +4,14 @@
java.naming.provider.url=${project.root}/test-provider.properties
test.excludes=true
test.excludesfile=${project.root}/08ExcludeList
+test.includesfile=${project.root}/08LongRunningList
log=info
max_prefetch=1000
amqj.logging.level=$log
+amqj.protocol.logging.level=$log
root.logging.level=$log
log4j.configuration=file:///${project.root}/log4j-test.xml
+log4j.debug=false
test.fork=no
test.mem=512M
test=*Test
Modified: incubator/qpid/trunk/qpid/java/default.testprofile
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/default.testprofile?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/default.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/default.testprofile Wed Jul 16 08:57:26 2008
@@ -7,8 +7,10 @@
log=info
max_prefetch=1000
amqj.logging.level=$log
+amqj.protocol.logging.level=$log
root.logging.level=$log
log4j.configuration=file:///${project.root}/log4j-test.xml
+log4j.debug=false
test.fork=no
test.mem=512M
test=*Test
Modified: incubator/qpid/trunk/qpid/java/log4j-test.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/log4j-test.xml?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/log4j-test.xml (original)
+++ incubator/qpid/trunk/qpid/java/log4j-test.xml Wed Jul 16 08:57:26 2008
@@ -35,11 +35,23 @@
</appender>
<logger name="org.apache.qpid">
- <level value="debug"/>
+ <level value="${amqj.logging.level}"/>
+ </logger>
+
+ <logger name="org.apache.qpidity">
+ <level value="${amqj.logging.level}"/>
+ </logger>
+
+ <logger name="qpid.protocol">
+ <level value="${amqj.protocol.logging.level}"/>
+ </logger>
+
+ <logger name="org.apache.qpid.test.utils.QpidTestCase">
+ <level value="ALL"/>
</logger>
<root>
- <level value="debug"/>
+ <level value="${root.logging.level}"/>
<appender-ref ref="console" />
</root>
</log4j:configuration>
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=677319&r1=677318&r2=677319&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Wed Jul 16 08:57:26 2008
@@ -211,6 +211,8 @@
<jvmarg value="${jvm.args}"/>
<sysproperty key="amqj.logging.level" value="${amqj.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}"/>
<sysproperty key="log4j.configuration" value="${log4j.configuration}"/>
<sysproperty key="java.naming.factory.initial" value="${java.naming.factory.initial}"/>