Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 8187 invoked from network); 11 Sep 2007 05:20:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Sep 2007 05:20:46 -0000 Received: (qmail 68819 invoked by uid 500); 11 Sep 2007 05:20:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 68794 invoked by uid 500); 11 Sep 2007 05:20:39 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 68785 invoked by uid 99); 11 Sep 2007 05:20:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2007 22:20:39 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Sep 2007 05:22:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5C1421A9838; Mon, 10 Sep 2007 22:20:22 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r574460 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq: ActiveMQMessageConsumer.java ActiveMQSession.java Date: Tue, 11 Sep 2007 05:20:22 -0000 To: commits@activemq.apache.org From: jstrachan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070911052022.5C1421A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jstrachan Date: Mon Sep 10 22:20:20 2007 New Revision: 574460 URL: http://svn.apache.org/viewvc?rev=574460&view=rev Log: added better debug logging Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?rev=574460&r1=574459&r2=574460&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Mon Sep 10 22:20:20 2007 @@ -413,7 +413,7 @@ return null; } else if (md.getMessage().isExpired()) { if (LOG.isDebugEnabled()) { - LOG.debug("Received expired message: " + md); + LOG.debug(getConsumerId() + " received expired message: " + md); } beforeMessageIsConsumed(md); afterMessageIsConsumed(md, true); @@ -422,7 +422,7 @@ } } else { if (LOG.isDebugEnabled()) { - LOG.debug("Received message: " + md); + LOG.debug(getConsumerId() + " received message: " + md); } return md; } @@ -613,7 +613,7 @@ try { session.asyncSendPacket(ackToSend); } catch (JMSException e) { - LOG.error("Failed to delivered acknowledgements", e); + LOG.error(getConsumerId() + " failed to delivered acknowledgements", e); } finally { deliveryingAcknowledgements.set(false); } @@ -940,7 +940,7 @@ // next message. afterMessageIsConsumed(md, false); } - LOG.error("Exception while processing message: " + e, e); + LOG.error(getConsumerId() + " Exception while processing message: " + e, e); } } else { unconsumedMessages.enqueue(md); @@ -951,7 +951,7 @@ } else { // ignore duplicate if (LOG.isDebugEnabled()) { - LOG.debug("Ignoring Duplicate: " + md.getMessage()); + LOG.debug(getConsumerId() + " Ignoring Duplicate: " + md.getMessage()); } ackLater(md, MessageAck.STANDARD_ACK_TYPE); } Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java?rev=574460&r1=574459&r2=574460&view=diff ============================================================================== --- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java (original) +++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Mon Sep 10 22:20:20 2007 @@ -488,6 +488,9 @@ if (!getTransacted()) { throw new javax.jms.IllegalStateException("Not a transacted session"); } + if (LOG.isDebugEnabled()) { + LOG.debug(getSessionId() + " Transaction Commit"); + } transactionContext.commit(); } @@ -505,6 +508,9 @@ if (!getTransacted()) { throw new javax.jms.IllegalStateException("Not a transacted session"); } + if (LOG.isDebugEnabled()) { + LOG.debug(getSessionId() + " Transaction Rollback"); + } transactionContext.rollback(); } @@ -1610,7 +1616,7 @@ msg.onSend(); msg.setProducerId(msg.getMessageId().getProducerId()); if (this.debug) { - LOG.debug("Sending message: " + msg); + LOG.debug(getSessionId() + " sending message: " + msg); } if (!connection.isAlwaysSyncSend() && (!msg.isPersistent() || connection.isUseAsyncSend() || txid != null)) { this.connection.asyncSendPacket(msg);