Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 16563 invoked from network); 11 Jul 2006 04:29:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Jul 2006 04:29:54 -0000 Received: (qmail 89863 invoked by uid 500); 11 Jul 2006 04:29:54 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 89851 invoked by uid 500); 11 Jul 2006 04:29:54 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 89842 invoked by uid 99); 11 Jul 2006 04:29:54 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 21:29:54 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: domain of chirino@apache.org designates 140.211.166.113 as permitted sender) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jul 2006 21:29:53 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9B0061A981A; Mon, 10 Jul 2006 21:29:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r420712 - /incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java Date: Tue, 11 Jul 2006 04:29:33 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060711042933.9B0061A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Mon Jul 10 21:29:31 2006 New Revision: 420712 URL: http://svn.apache.org/viewvc?rev=420712&view=rev Log: http://issues.apache.org/activemq/browse/AMQ-809 Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java?rev=420712&r1=420711&r2=420712&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/TransportLogger.java Mon Jul 10 21:29:31 2006 @@ -19,6 +19,7 @@ import java.io.IOException; import org.apache.activemq.command.Command; +import org.apache.activemq.command.Response; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -32,7 +33,7 @@ private final Log log; public TransportLogger(Transport next) { - this( next, LogFactory.getLog(TransportLogger.class.getName()+":"+getNextId())); + this( next, LogFactory.getLog(TransportLogger.class.getName()+".Connection:"+getNextId())); } synchronized private static int getNextId() { @@ -44,6 +45,26 @@ this.log = log; } + public Response request(Command command) throws IOException { + log.debug("SENDING REQUEST: "+command); + Response rc = super.request(command); + log.debug("GOT RESPONSE: "+rc); + return rc; + } + + public Response request(Command command, int timeout) throws IOException { + log.debug("SENDING REQUEST: "+command); + Response rc = super.request(command, timeout); + log.debug("GOT RESPONSE: "+rc); + return rc; + } + + public FutureResponse asyncRequest(Command command, ResponseCallback responseCallback) throws IOException { + log.debug("SENDING ASNYC REQUEST: "+command); + FutureResponse rc = next.asyncRequest(command, responseCallback); + return rc; + } + public void oneway(Command command) throws IOException { if( log.isDebugEnabled() ) { log.debug("SENDING: "+command); @@ -53,7 +74,11 @@ public void onCommand(Command command) { if( log.isDebugEnabled() ) { - log.debug("RECEIVED: from: "+ command.getFrom() + " : " + command); + if( command.getFrom()!=null ) { + log.debug("RECEIVED: from: "+ command.getFrom() + " : " + command); + } else { + log.debug("RECEIVED: " + command); + } } getTransportListener().onCommand(command); }