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 2008/01/28 23:58:34 UTC
svn commit: r616100 - in /mina/trunk:
core/src/main/java/org/apache/mina/common/
core/src/main/java/org/apache/mina/filter/codec/
core/src/main/java/org/apache/mina/filter/firewall/
core/src/main/java/org/apache/mina/filter/keepalive/ core/src/main/jav...
Author: maarten
Date: Mon Jan 28 14:58:32 2008
New Revision: 616100
URL: http://svn.apache.org/viewvc?rev=616100&view=rev
Log:
resolve DIRMINA-513 : get rid of IoSessionLogger
Removed:
mina/trunk/core/src/main/java/org/apache/mina/common/IoSessionLogger.java
Modified:
mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java
mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java
mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java
mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
mina/trunk/example/src/main/resources/log4j.properties
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/DefaultIoFilterChain.java Mon Jan 28 14:58:32 2008
@@ -26,6 +26,8 @@
import java.util.Map;
import org.apache.mina.common.IoFilter.NextFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A default implementation of {@link IoFilterChain} that provides
@@ -52,6 +54,8 @@
private final EntryImpl tail;
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
public DefaultIoFilterChain(AbstractIoSession session) {
if (session == null) {
throw new NullPointerException("session");
@@ -442,8 +446,7 @@
entry.getFilter().exceptionCaught(entry.getNextFilter(), session,
cause);
} catch (Throwable e) {
- IoSessionLogger.getLogger(session, getClass()).warn(
- "Unexpected exception from exceptionCaught handler.", e);
+ logger.warn("Unexpected exception from exceptionCaught handler.", e);
}
} else {
// Please note that this place is not the only place that
Modified: mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/common/IoHandlerAdapter.java Mon Jan 28 14:58:32 2008
@@ -19,6 +19,9 @@
*/
package org.apache.mina.common;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* An abstract adapter class for {@link IoHandler}. You can extend this
@@ -29,6 +32,9 @@
* @version $Rev$, $Date$
*/
public class IoHandlerAdapter implements IoHandler {
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
public void sessionCreated(IoSession session) throws Exception {
}
@@ -44,7 +50,6 @@
public void exceptionCaught(IoSession session, Throwable cause)
throws Exception {
- IoSessionLogger logger = IoSessionLogger.getLogger(session, getClass());
if (logger.isWarnEnabled()) {
logger.warn("EXCEPTION, please implement "
+ getClass().getName()
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/ProtocolCodecFilter.java Mon Jan 28 14:58:32 2008
@@ -30,11 +30,12 @@
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.NothingWrittenException;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An {@link IoFilter} which translates binary or protocol specific data into
@@ -54,6 +55,8 @@
private final AttributeKey DECODER_OUT = new AttributeKey(getClass(), "decoderOut");
private final ProtocolCodecFactory factory;
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
public ProtocolCodecFilter(ProtocolCodecFactory factory) {
if (factory == null) {
throw new NullPointerException("factory");
@@ -316,7 +319,7 @@
try {
encoder.dispose(session);
} catch (Throwable t) {
- IoSessionLogger.getLogger(session, getClass()).warn(
+ logger.warn(
"Failed to dispose: " + encoder.getClass().getName() + " (" + encoder + ')');
}
}
@@ -331,7 +334,7 @@
try {
decoder.dispose(session);
} catch (Throwable t) {
- IoSessionLogger.getLogger(session, getClass()).warn(
+ logger.warn(
"Falied to dispose: " + decoder.getClass().getName() + " (" + decoder + ')');
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/BlacklistFilter.java Mon Jan 28 14:58:32 2008
@@ -29,8 +29,9 @@
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link IoFilter} which blocks connections from blacklisted remote
@@ -42,6 +43,7 @@
public class BlacklistFilter extends IoFilterAdapter {
private final List<InetAddress> blacklist = new CopyOnWriteArrayList<InetAddress>();
+ private final Logger logger = LoggerFactory.getLogger(getClass());
/**
* Sets the addresses to be blacklisted.
*
@@ -175,7 +177,7 @@
}
private void blockSession(IoSession session) {
- IoSessionLogger.getLogger(session, getClass()).warn("Remote address in the blacklist; closing.");
+ logger.warn("Remote address in the blacklist; closing.");
session.close();
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/firewall/ConnectionThrottleFilter.java Mon Jan 28 14:58:32 2008
@@ -28,7 +28,8 @@
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link IoFilter} which blocks connections from connecting
@@ -44,6 +45,7 @@
private final Map<String, Long> clients;
+ private final Logger logger = LoggerFactory.getLogger(getClass());
/**
* Default constructor. Sets the wait time to 1 second
*/
@@ -93,7 +95,7 @@
if (clients.containsKey(addr.getAddress().getHostAddress())) {
- IoSessionLogger.getLogger(session, getClass()).debug("This is not a new client");
+ logger.debug("This is not a new client");
Long lastConnTime = clients.get(addr.getAddress()
.getHostAddress());
@@ -102,8 +104,7 @@
// if the interval between now and the last connection is
// less than the allowed interval, return false
if (now - lastConnTime < allowedInterval) {
- IoSessionLogger.getLogger(session, getClass()).warn(
- "Session connection interval too short");
+ logger.warn("Session connection interval too short");
return false;
} else {
return true;
@@ -121,8 +122,7 @@
public void sessionCreated(NextFilter nextFilter, IoSession session)
throws Exception {
if (!isConnectionOk(session)) {
- IoSessionLogger.getLogger(session, getClass()).warn(
- "Connections coming in too fast; closing.");
+ logger.warn("Connections coming in too fast; closing.");
session.close();
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/keepalive/KeepAliveFilter.java Mon Jan 28 14:58:32 2008
@@ -27,9 +27,9 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
import org.apache.mina.common.IoSessionConfig;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteRequest;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An {@link IoFilter} that sends a keep-alive request on
@@ -128,6 +128,8 @@
private volatile KeepAlivePolicy policy;
private volatile int keepAliveRequestInterval;
private volatile int keepAliveRequestTimeout;
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
/**
* Creates a new instance with the default {@link KeepAlivePolicy} and
@@ -311,7 +313,6 @@
}
private void logTimeout(IoSession session) {
- Logger logger = IoSessionLogger.getLogger(session, getClass());
if (logger.isWarnEnabled()) {
logger.warn(getTimeoutMessage());
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LogLevel.java Mon Jan 28 14:58:32 2008
@@ -19,8 +19,6 @@
*/
package org.apache.mina.filter.logging;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.slf4j.Logger;
/**
@@ -37,7 +35,7 @@
* {@link LogLevel} which will not log any information
*/
NONE(new LogLevelLogger() {
- public void log(Logger logger, String message) {
+ public void log(Logger logger, String message, Object[] args) {
}
public void log(Logger logger, String message, Throwable cause) {
@@ -48,8 +46,8 @@
* {@link LogLevel} which logs messages on the TRACE level.
*/
TRACE(new LogLevelLogger() {
- public void log(Logger logger, String message) {
- logger.trace(message);
+ public void log(Logger logger, String message, Object[] args) {
+ logger.trace(message, args);
}
public void log(Logger logger, String message, Throwable cause) {
@@ -61,8 +59,8 @@
* {@link LogLevel} which logs messages on the DEBUG level.
*/
DEBUG(new LogLevelLogger() {
- public void log(Logger logger, String message) {
- logger.debug(message);
+ public void log(Logger logger, String message, Object[] args) {
+ logger.debug(message, args);
}
public void log(Logger logger, String message, Throwable cause) {
@@ -74,8 +72,8 @@
* {@link LogLevel} which logs messages on the INFO level.
*/
INFO(new LogLevelLogger() {
- public void log(Logger logger, String message) {
- logger.info(message);
+ public void log(Logger logger, String message, Object[] args) {
+ logger.info(message, args);
}
public void log(Logger logger, String message, Throwable cause) {
@@ -87,8 +85,8 @@
* {@link LogLevel} which logs messages on the WARN level.
*/
WARN(new LogLevelLogger() {
- public void log(Logger logger, String message) {
- logger.warn(message);
+ public void log(Logger logger, String message, Object[] args) {
+ logger.warn(message, args);
}
public void log(Logger logger, String message, Throwable cause) {
@@ -100,8 +98,8 @@
* {@link LogLevel} which logs messages on the ERROR level.
*/
ERROR(new LogLevelLogger() {
- public void log(Logger logger, String message) {
- logger.error(message);
+ public void log(Logger logger, String message, Object[] args) {
+ logger.error(message, args);
}
public void log(Logger logger, String message, Throwable cause) {
@@ -114,17 +112,17 @@
private LogLevel(LogLevelLogger logger) {
this.logger = logger;
}
-
- void log(IoSession session, String name, String message) {
- this.logger.log(IoSessionLogger.getLogger(session, name), message);
+
+ void log(Logger logger, String format, Object[] args) {
+ this.logger.log(logger, format, args);
}
-
- void log(IoSession session, String name, String message, Throwable cause) {
- this.logger.log(IoSessionLogger.getLogger(session, name), message, cause);
+
+ void log(Logger logger, String message, Throwable cause) {
+ this.logger.log(logger, message, cause);
}
-
+
private interface LogLevelLogger {
- void log(Logger logger, String message);
+ void log(Logger logger, String message, Object[] args);
void log(Logger logger, String message, Throwable cause);
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/logging/LoggingFilter.java Mon Jan 28 14:58:32 2008
@@ -26,12 +26,13 @@
import org.apache.mina.common.IoFilter;
import org.apache.mina.common.IoFilterAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.util.CopyOnWriteMap;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * Logs all MINA protocol events using the {@link IoSessionLogger}. Each event can be
+ * Logs all MINA protocol events. Each event can be
* tuned to use a different level based on the user's specific requirements. Methods
* are in place that allow the user to use either the get or set method for each event
* and pass in the {@link IoEventType} and the {@link LogLevel}.
@@ -47,7 +48,7 @@
private final Map<IoEventType, LogLevel> logSettings = new CopyOnWriteMap<IoEventType, LogLevel>();
private final String name;
-
+ private final Logger logger;
/**
* Default Constructor.
*/
@@ -60,7 +61,11 @@
}
public LoggingFilter(String name) {
+ if (name == null) {
+ throw new NullPointerException("name should not be null");
+ }
this.name = name;
+ this.logger = LoggerFactory.getLogger(name);
// Exceptions will be logged to WARN as default.
setLogLevel(IoEventType.EXCEPTION_CAUGHT, LogLevel.WARN);
@@ -79,53 +84,53 @@
@Override
public void exceptionCaught(NextFilter nextFilter, IoSession session,
Throwable cause) throws Exception {
- getLogLevel(IoEventType.EXCEPTION_CAUGHT).log(
- session, name, "EXCEPTION: ", cause);
+ getLogLevel(IoEventType.EXCEPTION_CAUGHT).log(logger, "EXCEPTION: ", cause);
nextFilter.exceptionCaught(session, cause);
}
@Override
public void messageReceived(NextFilter nextFilter, IoSession session,
Object message) throws Exception {
- getLogLevel(IoEventType.MESSAGE_RECEIVED).log(
- session, name, "RECEIVED: " + message);
+ log(IoEventType.MESSAGE_RECEIVED, "RECEIVED: {}", message);
nextFilter.messageReceived(session, message);
}
@Override
public void messageSent(NextFilter nextFilter, IoSession session,
WriteRequest writeRequest) throws Exception {
- getLogLevel(IoEventType.MESSAGE_SENT).log(
- session, name, "SENT: " + writeRequest.getMessage());
+ log(IoEventType.MESSAGE_SENT, "SENT: {}", writeRequest.getMessage());
nextFilter.messageSent(session, writeRequest);
}
@Override
- public void sessionClosed(NextFilter nextFilter, IoSession session)
- throws Exception {
- getLogLevel(IoEventType.SESSION_CLOSED).log(session, name, "CLOSED");
+ public void sessionClosed(NextFilter nextFilter, IoSession session) throws Exception {
+ log(IoEventType.SESSION_CLOSED, "CLOSED", null);
nextFilter.sessionClosed(session);
}
@Override
public void sessionCreated(NextFilter nextFilter, IoSession session)
throws Exception {
- getLogLevel(IoEventType.SESSION_CREATED).log(session, name, "CREATED");
+ log(IoEventType.SESSION_CREATED, "CREATED", null);
nextFilter.sessionCreated(session);
}
@Override
public void sessionIdle(NextFilter nextFilter, IoSession session,
IdleStatus status) throws Exception {
- getLogLevel(IoEventType.SESSION_IDLE).log(session, name, "IDLE: " + status);
+ log(IoEventType.SESSION_IDLE, "IDLE: {}", status);
nextFilter.sessionIdle(session, status);
}
@Override
public void sessionOpened(NextFilter nextFilter, IoSession session)
throws Exception {
- getLogLevel(IoEventType.SESSION_OPENED).log(session, name, "OPENED");
+ log(IoEventType.SESSION_OPENED, "OPENED", null);
nextFilter.sessionOpened(session);
+ }
+
+ private void log(IoEventType eventType, String format, Object arg) {
+ getLogLevel(eventType).log(logger, format, new Object[] { arg });
}
/**
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/reqres/RequestResponseFilter.java Mon Jan 28 14:58:32 2008
@@ -34,9 +34,10 @@
import org.apache.mina.common.AttributeKey;
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.filter.util.WriteRequestFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -52,6 +53,8 @@
private final ResponseInspectorFactory responseInspectorFactory;
private final ScheduledExecutorService timeoutScheduler;
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
public RequestResponseFilter(final ResponseInspector responseInspector,
ScheduledExecutorService timeoutScheduler) {
if (responseInspector == null) {
@@ -151,7 +154,6 @@
if (request == null) {
// A response message without request. Swallow the event because
// the response might have arrived too late.
- IoSessionLogger logger = IoSessionLogger.getLogger(session, getClass());
if (logger.isWarnEnabled()) {
logger.warn("Unknown request ID '" + requestId
+ "' for the response message. Timed out already?: "
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslFilter.java Mon Jan 28 14:58:32 2008
@@ -38,7 +38,6 @@
import org.apache.mina.common.IoFutureListener;
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.WriteRequestWrapper;
@@ -57,7 +56,6 @@
* Java version 5 or above is mandatory to use this filter. And please note that
* this filter only works for TCP/IP connections.
* <p>
- * This filter logs debug information using {@link IoSessionLogger}.
*
* <h2>Implementing StartTLS</h2>
* <p>
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/ssl/SslHandler.java Mon Jan 28 14:58:32 2008
@@ -36,12 +36,12 @@
import org.apache.mina.common.IoEventType;
import org.apache.mina.common.IoFilterEvent;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteFuture;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.common.IoFilter.NextFilter;
import org.apache.mina.util.CircularQueue;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A helper class using the SSLEngine API to decrypt/encrypt data.
@@ -56,7 +56,7 @@
*/
class SslHandler {
- private final Logger logger;
+ private final Logger logger = LoggerFactory.getLogger(getClass());
private final SslFilter parent;
private final SSLContext ctx;
private final IoSession session;
@@ -101,7 +101,6 @@
this.parent = parent;
this.session = session;
this.ctx = sslc;
- this.logger = IoSessionLogger.getLogger(session, SslFilter.class);
init();
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/ReadThrottleFilter.java Mon Jan 28 14:58:32 2008
@@ -34,11 +34,11 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.TrafficMask;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.util.CopyOnWriteMap;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An {@link IoFilter} that throttles incoming traffic to
@@ -71,7 +71,8 @@
private static final Object globalResumeLock = new Object();
private static long lastGlobalResumeTime = 0;
-
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
/**
* Returns the current amount of data in the buffer of the {@link ExecutorFilter}
* for all {@link IoSession} whose {@link IoFilterChain} has been configured by
@@ -408,7 +409,6 @@
private void enter(IoSession session, int size) {
State state = getState(session);
- Logger logger = IoSessionLogger.getLogger(session, getClass());
int globalBufferSize = ReadThrottleFilter.globalBufferSize.addAndGet(size);
int serviceBufferSize = increaseServiceBufferSize(session.getService(), size);
@@ -470,7 +470,6 @@
private void exit(IoSession session, int size) {
State state = getState(session);
- Logger logger = IoSessionLogger.getLogger(session, getClass());
int globalBufferSize = ReadThrottleFilter.globalBufferSize.addAndGet(-size);
if (globalBufferSize < 0) {
@@ -585,7 +584,6 @@
if (resume) {
session.resumeRead();
- Logger logger = IoSessionLogger.getLogger(session, getClass());
if (logger.isDebugEnabled()) {
logger.debug(getMessage(session, " Resumed - "));
}
@@ -607,7 +605,7 @@
}
if (log) {
- IoSessionLogger.getLogger(session, getClass()).warn(getMessage(session));
+ logger.warn(getMessage(session));
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/traffic/WriteThrottleFilter.java Mon Jan 28 14:58:32 2008
@@ -28,11 +28,12 @@
import org.apache.mina.common.IoFilterChain;
import org.apache.mina.common.IoService;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.WriteException;
import org.apache.mina.common.WriteRequest;
import org.apache.mina.util.CopyOnWriteMap;
import org.apache.mina.util.MapBackedSet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An {@link IoFilter} that throttles outgoing traffic to prevent a unwanted
@@ -52,6 +53,8 @@
*/
public class WriteThrottleFilter extends IoFilterAdapter {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
private static final Set<IoService> activeServices =
new MapBackedSet<IoService>(new CopyOnWriteMap<IoService, Boolean>());
@@ -323,7 +326,7 @@
}
if (log) {
- IoSessionLogger.getLogger(session, getClass()).warn(getMessage(session));
+ logger.warn(getMessage(session));
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/handler/stream/StreamIoHandler.java Mon Jan 28 14:58:32 2008
@@ -30,7 +30,8 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link IoHandler} that adapts asynchronous MINA events to stream I/O.
@@ -44,6 +45,8 @@
* @version $Rev$, $Date$
*/
public abstract class StreamIoHandler extends IoHandlerAdapter {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
private static final AttributeKey KEY_IN = new AttributeKey(StreamIoHandler.class, "in");
private static final AttributeKey KEY_OUT = new AttributeKey(StreamIoHandler.class, "out");
@@ -153,8 +156,7 @@
if (e != null && in != null) {
in.throwException(e);
} else {
- IoSessionLogger.getLogger(session, getClass()).warn(
- "Unexpected exception.", cause);
+ logger.warn("Unexpected exception.", cause);
session.close();
}
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/ChatProtocolHandler.java Mon Jan 28 14:58:32 2008
@@ -26,7 +26,6 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.filter.logging.MdcInjectionFilter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +37,8 @@
* @version $Rev$, $Date$
*/
public class ChatProtocolHandler extends IoHandlerAdapter {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
private final Set<IoSession> sessions = Collections
.synchronizedSet(new HashSet<IoSession>());
@@ -46,7 +47,7 @@
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
- IoSessionLogger.getLogger(session).warn(cause);
+ logger.warn("Unexpected exception.", cause);
// Close connection when unexpected exception is caught.
session.close();
}
@@ -109,12 +110,12 @@
}
break;
default:
- IoSessionLogger.getLogger(session).info("Unhandled command: " + command);
+ logger.info("Unhandled command: " + command);
break;
}
} catch (IllegalArgumentException e) {
- IoSessionLogger.getLogger(session).debug(e);
+ logger.debug("Illegal argument", e);
}
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/chat/client/ChatClientSupport.java Mon Jan 28 14:58:32 2008
@@ -28,6 +28,7 @@
import org.apache.mina.common.IoSession;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
+import org.apache.mina.filter.logging.MdcInjectionFilter;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
/**
@@ -59,6 +60,7 @@
}
try {
+ connector.getFilterChain().addLast("mdc", new MdcInjectionFilter());
if (useSsl) {
SSLContext sslContext = BogusSslContextFactory
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/echoserver/EchoProtocolHandler.java Mon Jan 28 14:58:32 2008
@@ -24,8 +24,9 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.filter.ssl.SslFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link IoHandler} implementation for echo server.
@@ -34,6 +35,8 @@
* @version $Rev$, $Date$,
*/
public class EchoProtocolHandler extends IoHandlerAdapter {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
@Override
public void sessionCreated(IoSession session) {
session.getConfig().setIdleTime(IdleStatus.BOTH_IDLE, 10);
@@ -44,18 +47,17 @@
@Override
public void sessionClosed(IoSession session) throws Exception {
- IoSessionLogger.getLogger(session).info("CLOSED");
+ logger.info("CLOSED");
}
@Override
public void sessionOpened(IoSession session) throws Exception {
- IoSessionLogger.getLogger(session).info("OPENED");
+ logger.info("OPENED");
}
@Override
public void sessionIdle(IoSession session, IdleStatus status) {
- IoSessionLogger.getLogger(session).info(
- "*** IDLE #" + session.getIdleCount(IdleStatus.BOTH_IDLE) + " ***");
+ logger.info("*** IDLE #" + session.getIdleCount(IdleStatus.BOTH_IDLE) + " ***");
}
@Override
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/imagine/step1/server/ImageServerIoHandler.java Mon Jan 28 14:58:32 2008
@@ -21,7 +21,6 @@
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.example.imagine.step1.ImageRequest;
import org.apache.mina.example.imagine.step1.ImageResponse;
import org.slf4j.Logger;
@@ -52,8 +51,7 @@
}
public void exceptionCaught(IoSession session, Throwable cause) throws Exception {
- IoSessionLogger sessionLogger = IoSessionLogger.getLogger(session, logger);
- sessionLogger.warn(cause.getMessage(), cause);
+ logger.warn(cause.getMessage(), cause);
}
public void messageReceived(IoSession session, Object message) throws Exception {
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/proxy/AbstractProxyIoHandler.java Mon Jan 28 14:58:32 2008
@@ -24,8 +24,9 @@
import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.TrafficMask;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Base class of {@link org.apache.mina.common.IoHandler} classes which handle
@@ -38,6 +39,8 @@
public abstract class AbstractProxyIoHandler extends IoHandlerAdapter {
private static final Charset CHARSET = Charset.forName("iso8859-1");
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
@Override
public void sessionCreated(IoSession session) throws Exception {
session.setTrafficMask(TrafficMask.NONE);
@@ -62,6 +65,6 @@
wb.flip();
((IoSession) session.getAttribute("")).write(wb);
rb.reset();
- IoSessionLogger.getLogger(session).info(rb.getString(CHARSET.newDecoder()));
+ logger.info(rb.getString(CHARSET.newDecoder()));
}
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ClientSessionHandler.java Mon Jan 28 14:58:32 2008
@@ -22,9 +22,10 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link IoHandler} for SumUp client.
@@ -33,6 +34,9 @@
* @version $Rev$, $Date$
*/
public class ClientSessionHandler extends IoHandlerAdapter {
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
private final int[] values;
private boolean finished;
@@ -68,13 +72,13 @@
// it is time to disconnect.
if (rm.getSequence() == values.length - 1) {
// print the sum and disconnect.
- IoSessionLogger.getLogger(session).info("The sum: " + rm.getValue());
+ logger.info("The sum: " + rm.getValue());
session.close();
finished = true;
}
} else {
// seever returned error code because of overflow, etc.
- IoSessionLogger.getLogger(session).warn("Server error, disconnecting...");
+ logger.warn("Server error, disconnecting...");
session.close();
finished = true;
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/sumup/ServerSessionHandler.java Mon Jan 28 14:58:32 2008
@@ -23,9 +23,10 @@
import org.apache.mina.common.IoHandler;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.example.sumup.message.AddMessage;
import org.apache.mina.example.sumup.message.ResultMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* {@link IoHandler} for SumUp server.
@@ -36,6 +37,8 @@
public class ServerSessionHandler extends IoHandlerAdapter {
private static final String SUM_KEY = "sum";
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
@Override
public void sessionOpened(IoSession session) {
@@ -78,7 +81,7 @@
@Override
public void sessionIdle(IoSession session, IdleStatus status) {
- IoSessionLogger.getLogger(session).info("Disconnecting the idle.");
+ logger.info("Disconnecting the idle.");
// disconnect an idle client
session.close();
}
Modified: mina/trunk/example/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/resources/log4j.properties?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/main/resources/log4j.properties (original)
+++ mina/trunk/example/src/main/resources/log4j.properties Mon Jan 28 14:58:32 2008
@@ -4,7 +4,7 @@
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
+#log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %p [%c] - %m%n
# you could use this pattern to test the MDC with the Chat server
-# log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %t %p %X{name} [%X{user}] [%X{remoteAddress}] [%c] - %m%n
\ No newline at end of file
+log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %t %p %X{name} [%X{user}] [%X{remoteAddress}] [%c] - %m%n
\ No newline at end of file
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/AbstractTest.java Mon Jan 28 14:58:32 2008
@@ -28,12 +28,13 @@
import org.apache.mina.common.IoAcceptor;
import org.apache.mina.common.IoBuffer;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.example.echoserver.ssl.BogusSslContextFactory;
import org.apache.mina.filter.ssl.SslFilter;
import org.apache.mina.transport.socket.DatagramSessionConfig;
import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests echo server example.
@@ -42,6 +43,8 @@
* @version $Rev:448075 $, $Date:2006-09-20 05:26:53Z $
*/
public abstract class AbstractTest extends TestCase {
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
protected boolean useSSL;
protected int port;
@@ -128,7 +131,7 @@
if (session.getFilterChain().contains("SSL")
&& buf.remaining() == 1
&& buf.get() == (byte) '.') {
- IoSessionLogger.getLogger(session).info("TLS Reentrance");
+ logger.info("TLS Reentrance");
((SslFilter) session.getFilterChain().get("SSL"))
.startSsl(session);
Modified: mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java?rev=616100&r1=616099&r2=616100&view=diff
==============================================================================
--- mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java (original)
+++ mina/trunk/example/src/test/java/org/apache/mina/example/echoserver/ConnectorTest.java Mon Jan 28 14:58:32 2008
@@ -28,7 +28,6 @@
import org.apache.mina.common.IoConnector;
import org.apache.mina.common.IoHandlerAdapter;
import org.apache.mina.common.IoSession;
-import org.apache.mina.common.IoSessionLogger;
import org.apache.mina.common.RuntimeIoException;
import org.apache.mina.common.WriteException;
import org.apache.mina.common.WriteFuture;
@@ -37,6 +36,8 @@
import org.apache.mina.transport.socket.nio.NioDatagramConnector;
import org.apache.mina.transport.socket.nio.NioSocketConnector;
import org.apache.mina.util.AvailablePortFinder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Tests echo server example.
@@ -45,6 +46,8 @@
* @version $Rev:448075 $, $Date:2006-09-20 05:26:53Z $
*/
public class ConnectorTest extends AbstractTest {
+ private final static Logger logger = LoggerFactory.getLogger(ConnectorTest.class);
+
private static final int TIMEOUT = 10000; // 10 seconds
private final int COUNT = 10;
@@ -193,7 +196,7 @@
//// in SocketIoProcessor if there was a read timeout because
//// we share readBuf.
readBuf.flip();
- IoSessionLogger.getLogger(session).info("readBuf: " + readBuf);
+ logger.info("readBuf: " + readBuf);
Assert.assertEquals(DATA_SIZE * COUNT, readBuf.remaining());
IoBuffer expectedBuf = IoBuffer.allocate(DATA_SIZE * COUNT);
for (int i = 0; i < COUNT; i++) {
@@ -245,10 +248,10 @@
@Override
public void exceptionCaught(IoSession session, Throwable cause) {
- IoSessionLogger.getLogger(session).warn(cause);
+ logger.warn("Unexpected exception.", cause);
if (cause instanceof WriteException) {
WriteException e = (WriteException) cause;
- IoSessionLogger.getLogger(session).warn("Failed write requests: {}", e.getRequests());
+ logger.warn("Failed write requests: {}", e.getRequests());
}
}
}