root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Introduce logging in TomcatWebSocketTestServer 

This commit replaces calls to System.out.println() with explicit logging.
This commit is contained in:
Sam Brannen 2015-07-20 17:03:44 +02:00
parent 0153913ef4
commit 24ff4f56e1
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-websocket/src/test/java/org/springframework/web/socket/TomcatWebSocketTestServer.java
View File

@ -27,6 +27,8 @@ import org.apache.catalina.LifecycleEvent;
import org.apache.catalina.LifecycleListener;
import org.apache.catalina.connector.Connector;
import org.apache.catalina.startup.Tomcat;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.coyote.http11.Http11NioProtocol;
import org.apache.tomcat.util.descriptor.web.FilterDef;
import org.apache.tomcat.util.descriptor.web.FilterMap;
@ -45,6 +47,8 @@ import org.springframework.web.servlet.DispatcherServlet;
*/
public class TomcatWebSocketTestServer implements WebSocketTestServer {
private static final Log logger = LogFactory.getLog(TomcatWebSocketTestServer.class);
private Tomcat tomcatServer;
private int port = -1;
@ -127,7 +131,9 @@ public class TomcatWebSocketTestServer implements WebSocketTestServer {
this.context.addLifecycleListener(new LifecycleListener() {
@Override
public void lifecycleEvent(LifecycleEvent event) {
System.out.println(event.getType());
if (logger.isDebugEnabled()) {
logger.debug("Event: " + event.getType());
}
}
});
}

8
spring-websocket/src/test/resources/log4j.properties
View File

@ -2,7 +2,13 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.layout=org.apache.log4j.PatternLayout
log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%-5p] [%c] - %m%n
log4j.rootCategory=WARN, console
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.file=bin/spring-websocket.log
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n
log4j.rootCategory=WARN, console, file
log4j.logger.org.springframework.web=WARN
log4j.logger.org.springframework.web.socket=WARN
log4j.logger.org.springframework.messaging=WARN