[jboss-cvs] JBoss Messaging SVN: r3479 - trunk/src/main/org/jboss/messaging/core/remoting/integration.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Dec 12 04:31:27 EST 2007


Author: jmesnil
Date: 2007-12-12 04:31:27 -0500 (Wed, 12 Dec 2007)
New Revision: 3479

Added:
   trunk/src/main/org/jboss/messaging/core/remoting/integration/FilterChainSupport.java
Modified:
   trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaConnector.java
   trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaService.java
Log:
* refactored MINA logging filter to TRACE messages sent & received, session life cycle and WARN when an exception is caught

Added: trunk/src/main/org/jboss/messaging/core/remoting/integration/FilterChainSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/integration/FilterChainSupport.java	                        (rev 0)
+++ trunk/src/main/org/jboss/messaging/core/remoting/integration/FilterChainSupport.java	2007-12-12 09:31:27 UTC (rev 3479)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.core.remoting.integration;
+
+import static org.apache.mina.filter.logging.LogLevel.TRACE;
+import static org.apache.mina.filter.logging.LogLevel.WARN;
+
+import org.apache.mina.common.DefaultIoFilterChainBuilder;
+import org.apache.mina.filter.logging.LoggingFilter;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public class FilterChainSupport
+{
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   // Public --------------------------------------------------------
+
+   static void addLoggingFilter(DefaultIoFilterChainBuilder filterChain)
+   {
+      LoggingFilter filter = new LoggingFilter();
+
+      filter.setSessionCreatedLogLevel(TRACE);
+      filter.setSessionOpenedLogLevel(TRACE);
+      filter.setSessionIdleLogLevel(TRACE);
+      filter.setSessionClosedLogLevel(TRACE);
+      
+      filter.setMessageReceivedLogLevel(TRACE);
+      filter.setMessageSentLogLevel(TRACE);
+      
+      filter.setExceptionCaughtLogLevel(WARN);
+      
+      filterChain.addLast("logger", filter);
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+}

Modified: trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaConnector.java	2007-12-11 23:46:28 UTC (rev 3478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaConnector.java	2007-12-12 09:31:27 UTC (rev 3479)
@@ -6,6 +6,8 @@
  */
 package org.jboss.messaging.core.remoting.integration;
 
+import static org.jboss.messaging.core.remoting.integration.FilterChainSupport.addLoggingFilter;
+
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.util.HashMap;
@@ -21,7 +23,6 @@
 import org.apache.mina.common.IoServiceListener;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.logging.LoggingFilter;
 import org.apache.mina.filter.logging.MdcInjectionFilter;
 import org.apache.mina.filter.reqres.RequestResponseFilter;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
@@ -72,16 +73,15 @@
 
       addBlockingRequestResponseFilter(connector.getFilterChain());
 
-      connector.getFilterChain().addLast("logger", new LoggingFilter());
+      addLoggingFilter(connector.getFilterChain());
 
       connector.setHandler(new MinaHandler(PacketDispatcher.client));
       connector.getSessionConfig().setKeepAlive(true);
       connector.getSessionConfig().setReuseAddress(true);
-}
+   }
+
+   // NIOConnector implementation -----------------------------------
    
-   /* (non-Javadoc)
-    * @see org.jboss.messaging.core.remoting.integration.NIOConnector#connect(java.lang.String, int, org.jboss.messaging.core.remoting.TransportType)
-    */
    public NIOSession connect(String host, int port, TransportType transport) throws IOException {
       assert host != null;
       assert port > 0;
@@ -100,9 +100,6 @@
       return new MinaSession(session);
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.messaging.core.remoting.integration.NIOConnector#disconnect()
-    */
    public boolean disconnect()
    {
       if (session == null)
@@ -123,9 +120,6 @@
       return closed;
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.messaging.core.remoting.integration.NIOConnector#addConnectionListener(org.jboss.jms.client.remoting.ConsolidatedRemotingConnectionListener)
-    */
    public void addConnectionListener(
          final ConsolidatedRemotingConnectionListener listener)
    {
@@ -140,9 +134,6 @@
          log.trace("added listener " + listener + " to " + this);
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.messaging.core.remoting.integration.NIOConnector#removeConnectionListener(org.jboss.jms.client.remoting.ConsolidatedRemotingConnectionListener)
-    */
    public void removeConnectionListener(ConsolidatedRemotingConnectionListener listener)
    {
       assert listener != null;
@@ -155,9 +146,6 @@
          log.trace("removed listener " + listener + " from " + this);
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.messaging.core.remoting.integration.NIOConnector#getServerURI()
-    */
    public String getServerURI()
    {
       if (connector == null)

Modified: trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaService.java	2007-12-11 23:46:28 UTC (rev 3478)
+++ trunk/src/main/org/jboss/messaging/core/remoting/integration/MinaService.java	2007-12-12 09:31:27 UTC (rev 3479)
@@ -6,11 +6,11 @@
  */
 package org.jboss.messaging.core.remoting.integration;
 
+import static org.jboss.messaging.core.remoting.integration.FilterChainSupport.addLoggingFilter;
+
 import java.net.InetSocketAddress;
-import java.util.Formatter;
 
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.apache.mina.filter.logging.LoggingFilter;
 import org.apache.mina.filter.logging.MdcInjectionFilter;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.jboss.logging.Logger;
@@ -66,8 +66,6 @@
    {
       if (acceptor == null)
       {
-         info("Starting MINA on " + host + ":" + port);
-
          acceptor = new NioSocketAcceptor();
 
          // Prepare the configuration
@@ -75,8 +73,9 @@
          acceptor.getFilterChain().addLast("mdc", mdcInjectionFilter);
          acceptor.getFilterChain().addLast("codec",
                new ProtocolCodecFilter(new PacketCodecFactory()));
-         acceptor.getFilterChain().addLast("logger", new LoggingFilter());
 
+         addLoggingFilter(acceptor.getFilterChain());
+
          // Bind
          acceptor.setLocalAddress(new InetSocketAddress(host, port));
          acceptor.setReuseAddress(true);
@@ -86,11 +85,8 @@
 
          acceptor.setHandler(new MinaHandler(PacketDispatcher.server));
          acceptor.bind();
-
-         info("MINA started");
       } 
    }
-   
 
    public void stop()
    {
@@ -99,8 +95,6 @@
          acceptor.unbind();
          acceptor.dispose();
          acceptor = null;
-         
-         info("Stopped MINA ");
       }    
    }
    
@@ -110,11 +104,5 @@
 
    // Private -------------------------------------------------------
 
-   
-   private void info(String s)
-   {
-      log.info(new Formatter().format("### %-30s ###", s).toString());
-   }
-   
    // Inner classes -------------------------------------------------
 }




More information about the jboss-cvs-commits mailing list