[Jboss-cvs] JBoss Messaging SVN: r1199 - in trunk: src/main/org/jboss/jms/client/remoting src/main/org/jboss/messaging/core tests/etc
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Aug 5 00:48:47 EDT 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-08-05 00:48:44 -0400 (Sat, 05 Aug 2006)
New Revision: 1199
Added:
trunk/tests/etc/log4j.xml
Modified:
trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
Log:
minor reformatting
Modified: trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java 2006-08-05 04:47:55 UTC (rev 1198)
+++ trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java 2006-08-05 04:48:44 UTC (rev 1199)
@@ -234,18 +234,17 @@
*/
public HandleMessageResponse handleMessage(List msgs) throws HandleCallbackException
{
- if (trace) { log.trace(this + " receiving " + msgs.size() + " messages from the remoting layer"); }
+ if (trace) { log.trace(this + " receiving " + msgs.size() + " message(s) from the remoting layer"); }
synchronized (mainLock)
{
if (closed)
{
- //Ignore
+ // Ignore
return new HandleMessageResponse(false, 0);
}
- //Put the messages in the buffer
- //And notify any waiting receive()
+ // Put the messages in the buffer and notify any waiting receive()
processMessages(msgs);
@@ -255,16 +254,15 @@
boolean full = buffer.size() >= bufferSize;
- if (trace) { log.trace(this + " receiving messages from the remoting layer"); }
-
messagesAdded();
if (full)
{
serverSending = false;
+ if (trace) { log.trace(this + " is full"); }
}
- //For now we always accept all messages - in the future this may change
+ // For now we always accept all messages - in the future this may change
return new HandleMessageResponse(full, msgs.size());
}
}
@@ -438,11 +436,10 @@
}
}
- if (trace) { log.trace("received " + m + " after being blocked on the buffer"); }
+ if (trace) { log.trace("received " + m + " after being blocked on buffer"); }
- //If message is expired we still call pre and post deliver
- //this makes sure the message is acknowledged so it gets removed
- //from the queue/subscription
+ // If message is expired we still call pre and post deliver. This makes sure the
+ // message is acknowledged so it gets removed from the queue/subscription.
preDeliver(sessionDelegate, consumerID, m, isConnectionConsumer);
postDeliver(sessionDelegate, consumerID, m, isConnectionConsumer);
@@ -582,7 +579,8 @@
{
m = (MessageProxy)buffer.removeFirst();
- if (trace) { log.trace("Got message:" + m); }
+ if (trace) { log.trace("got " + m + " from buffer"); }
+
}
else
{
@@ -625,7 +623,7 @@
private void messagesAdded()
{
- //If we have a thread waiting on receive() we notify it
+ // If we have a thread waiting on receive() we notify it
if (receiverThread != null)
{
if (trace) { log.trace(this + " notifying receiver thread"); }
@@ -633,10 +631,12 @@
}
else if (listener != null)
{
- //We have a message listener
+ // We have a message listener
if (!listenerRunning)
{
listenerRunning = true;
+
+ if (trace) { log.trace(this + ": new ListenerRunner scheduled"); }
this.queueRunner(new ListenerRunner());
}
Modified: trunk/src/main/org/jboss/messaging/core/ChannelSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/ChannelSupport.java 2006-08-05 04:47:55 UTC (rev 1198)
+++ trunk/src/main/org/jboss/messaging/core/ChannelSupport.java 2006-08-05 04:48:44 UTC (rev 1199)
@@ -719,7 +719,7 @@
}
else
{
- if (trace) { log.trace(this + ": delivery returned for message:" + ref); }
+ if (trace) { log.trace(this + ": " + del + " returned for message:" + ref); }
//Receiver accepted the reference
Added: trunk/tests/etc/log4j.xml
===================================================================
--- trunk/tests/etc/log4j.xml 2006-08-05 04:47:55 UTC (rev 1198)
+++ trunk/tests/etc/log4j.xml 2006-08-05 04:48:44 UTC (rev 1199)
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- $Id: log4j.xml 1184 2006-08-03 18:52:12Z ovidiu.feodorov at jboss.com $ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${module.output}/logs/messaging-tests${remote.test.suffix}.trace.log"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <param name="Threshold" value="TRACE#org.jboss.logging.XLevel"/>
+
+ <!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
+ for each test. We need to append if we want to preserve a full testsuite run log.
+ Make sure the build script clears this log at the beginning of each run.
+ -->
+ <param name="Append" value="true"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] @%t %m%n"/>
+ </layout>
+ </appender>
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%t %d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.jboss.messaging">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <category name="org.jboss.jms">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <category name="org.jboss.test">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+
+ <!-- Ignoring trace from these: -->
+
+ <category name="org.jboss.jms.server.remoting.JMSServerInvocationHandler">
+ <priority value="DEBUG"/>
+ </category>
+
+ <category name="org.jboss.test.messaging.tools.jmx.MockJBossSecurityManager">
+ <priority value="DEBUG"/>
+ </category>
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
More information about the jboss-cvs-commits
mailing list