You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ma...@apache.org on 2009/05/23 23:02:13 UTC
svn commit: r778025 - in /mina/trunk/core/src:
main/java/org/apache/mina/core/filterchain/
main/java/org/apache/mina/filter/executor/
main/java/org/apache/mina/filter/logging/
test/java/org/apache/mina/filter/logging/
Author: maarten
Date: Sat May 23 21:02:13 2009
New Revision: 778025
URL: http://svn.apache.org/viewvc?rev=778025&view=rev
Log:
FIX for DIRMINA-711 : made test for MdcInjectionFilter more robust
Modified:
mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java
mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java?rev=778025&r1=778024&r2=778025&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/core/filterchain/IoFilterEvent.java Sat May 23 21:02:13 2009
@@ -37,7 +37,7 @@
*/
public class IoFilterEvent extends IoEvent {
/** A logger for this class */
- //static Logger LOGGER = LoggerFactory.getLogger(IoFilterEvent.class);
+ static Logger LOGGER = LoggerFactory.getLogger(IoFilterEvent.class);
private final NextFilter nextFilter;
@@ -60,13 +60,11 @@
IoSession session = getSession();
NextFilter nextFilter = getNextFilter();
IoEventType type = getType();
-
- /*
+
if ( LOGGER.isDebugEnabled()) {
LOGGER.debug( "Firing a {} event for session {}",type, session.getId() );
}
- */
-
+
switch (type) {
case MESSAGE_RECEIVED:
Object parameter = getParameter();
@@ -103,10 +101,8 @@
throw new IllegalArgumentException("Unknown event type: " + type);
}
- /*
if ( LOGGER.isDebugEnabled()) {
LOGGER.debug( "Event {} has been fired for session {}", type, session.getId() );
}
- */
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java?rev=778025&r1=778024&r2=778025&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/executor/OrderedThreadPoolExecutor.java Sat May 23 21:02:13 2009
@@ -53,7 +53,7 @@
*/
public class OrderedThreadPoolExecutor extends ThreadPoolExecutor {
/** A logger for this class (commented as it breaks MDCFlter tests) */
- //static Logger LOGGER = LoggerFactory.getLogger(OrderedThreadPoolExecutor.class);
+ static Logger LOGGER = LoggerFactory.getLogger(OrderedThreadPoolExecutor.class);
/** A default value for the initial pool size */
private static final int DEFAULT_INITIAL_THREAD_POOL_SIZE = 0;
@@ -441,7 +441,7 @@
sb.append(((IoEvent)elem).getType()).append(", ");
}
sb.append( "]\n" );
- //LOGGER.debug( sb.toString() );
+ LOGGER.debug( sb.toString() );
}
/**
@@ -485,11 +485,9 @@
offerSession = false;
}
- /*
if (LOGGER.isDebugEnabled()) {
print(tasksQueue, event);
}
- */
}
} else {
offerSession = false;
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java?rev=778025&r1=778024&r2=778025&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java Sat May 23 21:02:13 2009
@@ -55,7 +55,7 @@
* <li>"localPort"</li>
* </ul>
*
- * User code can also add properties to the context, via TODO : Finish the sentence
+ * User code can also add custom properties to the context, via {@link #setProperty(IoSession, String, String)}
*
* If you only want the MDC to be set for the IoHandler code, it's enough to add
* one MdcInjectionFilter at the end of the filter chain.
Modified: mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java?rev=778025&r1=778024&r2=778025&view=diff
==============================================================================
--- mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java (original)
+++ mina/trunk/core/src/test/java/org/apache/mina/filter/logging/MdcInjectionFilterTest.java Sat May 23 21:02:13 2009
@@ -22,9 +22,7 @@
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.SocketAddress;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
import java.util.concurrent.CountDownLatch;
import org.apache.log4j.AppenderSkeleton;
@@ -221,16 +219,18 @@
// make a copy to prevent ConcurrentModificationException
List<LoggingEvent> events = new ArrayList<LoggingEvent>(appender.events);
+ Set<String> loggersToCheck = new HashSet<String>();
+ loggersToCheck.add(MdcInjectionFilterTest.class.getName());
+ loggersToCheck.add(ProtocolCodecFilter.class.getName());
+ loggersToCheck.add(LoggingFilter.class.getName());
+
// verify that all logging events have correct MDC
for (LoggingEvent event : events) {
- if (!ExecutorFilter.class.getName().equals(event.getLoggerName())) {
+
+ if (loggersToCheck.contains(event.getLoggerName())) {
Object remoteAddress = event.getMDC("remoteAddress");
- assertNotNull(
- "MDC[remoteAddress] not set for [" + event.getMessage() + "]",
- remoteAddress);
- assertNotNull(
- "MDC[remotePort] not set for [" + event.getMessage() + "]",
- event.getMDC("remotePort"));
+ assertNotNull("MDC[remoteAddress] not set for [" + event.getMessage() + "]", remoteAddress);
+ assertNotNull("MDC[remotePort] not set for [" + event.getMessage() + "]", event.getMDC("remotePort"));
assertEquals(
"every event should have MDC[handlerClass]",
SimpleIoHandler.class.getName(),