From abcb39b638c1fe55429dd3a8fcbca7d002efd225 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Thu, 13 Feb 2014 19:31:17 -0800 Subject: [PATCH] Do not use String.format() for log message generation - It's slow. --- .../codec/http/websocketx/WebSocketClientHandshaker07.java | 5 +++-- .../codec/http/websocketx/WebSocketClientHandshaker08.java | 5 +++-- .../codec/http/websocketx/WebSocketClientHandshaker13.java | 5 +++-- .../codec/http/websocketx/WebSocketServerHandshaker.java | 2 +- .../codec/http/websocketx/WebSocketServerHandshaker00.java | 2 +- .../codec/http/websocketx/WebSocketServerHandshaker07.java | 4 ++-- .../codec/http/websocketx/WebSocketServerHandshaker08.java | 4 ++-- .../codec/http/websocketx/WebSocketServerHandshaker13.java | 4 ++-- .../main/java/io/netty/handler/logging/LoggingHandler.java | 5 +++-- 9 files changed, 20 insertions(+), 16 deletions(-) diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java index a012055469..6db3d4c501 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker07.java @@ -110,8 +110,9 @@ public class WebSocketClientHandshaker07 extends WebSocketClientHandshaker { expectedChallengeResponseString = WebSocketUtil.base64(sha1); if (logger.isDebugEnabled()) { - logger.debug(String.format("WS Version 07 Client Handshake key: %s. Expected response: %s.", key, - expectedChallengeResponseString)); + logger.debug( + "WebSocket version 07 client handshake key: {}, expected response: {}", + key, expectedChallengeResponseString); } // Format request diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java index d376721ac5..d2eee599cb 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java @@ -110,8 +110,9 @@ public class WebSocketClientHandshaker08 extends WebSocketClientHandshaker { expectedChallengeResponseString = WebSocketUtil.base64(sha1); if (logger.isDebugEnabled()) { - logger.debug(String.format("WS Version 08 Client Handshake key: %s. Expected response: %s.", key, - expectedChallengeResponseString)); + logger.debug( + "WebSocket version 08 client handshake key: {}, expected response: {}", + key, expectedChallengeResponseString); } // Format request diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java index ef18fca213..a3d9b9c272 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java @@ -110,8 +110,9 @@ public class WebSocketClientHandshaker13 extends WebSocketClientHandshaker { expectedChallengeResponseString = WebSocketUtil.base64(sha1); if (logger.isDebugEnabled()) { - logger.debug(String.format("WS Version 13 Client Handshake key: %s. Expected response: %s.", key, - expectedChallengeResponseString)); + logger.debug( + "WebSocket version 13 client handshake key: {}, expected response: {}", + key, expectedChallengeResponseString); } // Format request diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java index 22c8198d8e..f94b4f79f3 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java @@ -156,7 +156,7 @@ public abstract class WebSocketServerHandshaker { HttpHeaders responseHeaders, final ChannelPromise promise) { if (logger.isDebugEnabled()) { - logger.debug(String.format("%s WS Version %s server handshake", channel, version())); + logger.debug("%s WebSocket version %s server handshake", channel, version()); } FullHttpResponse response = newHandshakeResponse(req, responseHeaders); ChannelPipeline p = channel.pipeline(); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java index c55f3c6012..ad2f6e7df4 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java @@ -137,7 +137,7 @@ public class WebSocketServerHandshaker00 extends WebSocketServerHandshaker { String selectedSubprotocol = selectSubprotocol(subprotocols); if (selectedSubprotocol == null) { if (logger.isDebugEnabled()) { - logger.debug(String.format("Requested subprotocol(s) not supported: %s.", subprotocols)); + logger.debug("Requested subprotocol(s) not supported: {}", subprotocols); } } else { res.headers().add(SEC_WEBSOCKET_PROTOCOL, selectedSubprotocol); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java index e9cf0f6c7e..329f823bd4 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker07.java @@ -111,7 +111,7 @@ public class WebSocketServerHandshaker07 extends WebSocketServerHandshaker { String accept = WebSocketUtil.base64(sha1); if (logger.isDebugEnabled()) { - logger.debug(String.format("WS Version 7 Server Handshake key: %s. Response: %s.", key, accept)); + logger.debug("WebSocket version 07 server handshake key: {}, response: %s.", key, accept); } res.headers().add(Names.UPGRADE, WEBSOCKET.toLowerCase()); @@ -122,7 +122,7 @@ public class WebSocketServerHandshaker07 extends WebSocketServerHandshaker { String selectedSubprotocol = selectSubprotocol(subprotocols); if (selectedSubprotocol == null) { if (logger.isDebugEnabled()) { - logger.debug(String.format("Requested subprotocol(s) not supported: %s.", subprotocols)); + logger.debug("Requested subprotocol(s) not supported: {}", subprotocols); } } else { res.headers().add(Names.SEC_WEBSOCKET_PROTOCOL, selectedSubprotocol); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java index 6eaa91bc32..dcbe82e29d 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java @@ -110,7 +110,7 @@ public class WebSocketServerHandshaker08 extends WebSocketServerHandshaker { String accept = WebSocketUtil.base64(sha1); if (logger.isDebugEnabled()) { - logger.debug(String.format("WS Version 8 Server Handshake key: %s. Response: %s.", key, accept)); + logger.debug("WebSocket version 08 server handshake key: {}, response: {}", key, accept); } res.headers().add(Names.UPGRADE, WEBSOCKET.toLowerCase()); @@ -121,7 +121,7 @@ public class WebSocketServerHandshaker08 extends WebSocketServerHandshaker { String selectedSubprotocol = selectSubprotocol(subprotocols); if (selectedSubprotocol == null) { if (logger.isDebugEnabled()) { - logger.debug(String.format("Requested subprotocol(s) not supported: %s.", subprotocols)); + logger.debug("Requested subprotocol(s) not supported: {}", subprotocols); } } else { res.headers().add(Names.SEC_WEBSOCKET_PROTOCOL, selectedSubprotocol); diff --git a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java index bea52550ae..1c3a8845f8 100644 --- a/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java +++ b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java @@ -108,7 +108,7 @@ public class WebSocketServerHandshaker13 extends WebSocketServerHandshaker { String accept = WebSocketUtil.base64(sha1); if (logger.isDebugEnabled()) { - logger.debug(String.format("WS Version 13 Server Handshake key: %s. Response: %s.", key, accept)); + logger.debug("WebSocket version 13 server handshake key: {}, response: {}", key, accept); } res.headers().add(Names.UPGRADE, WEBSOCKET.toLowerCase()); @@ -119,7 +119,7 @@ public class WebSocketServerHandshaker13 extends WebSocketServerHandshaker { String selectedSubprotocol = selectSubprotocol(subprotocols); if (selectedSubprotocol == null) { if (logger.isDebugEnabled()) { - logger.debug(String.format("Requested subprotocol(s) not supported: %s.", subprotocols)); + logger.debug("Requested subprotocol(s) not supported: {}", subprotocols); } } else { res.headers().add(Names.SEC_WEBSOCKET_PROTOCOL, selectedSubprotocol); diff --git a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java index 80e513f09e..3cb4c76c1b 100644 --- a/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java +++ b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java @@ -21,6 +21,7 @@ import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler.Sharable; import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelOutboundHandler; import io.netty.channel.ChannelPromise; import io.netty.util.internal.StringUtil; import io.netty.util.internal.logging.InternalLogLevel; @@ -38,7 +39,7 @@ public class LoggingHandler extends ChannelDuplexHandler { private static final LogLevel DEFAULT_LEVEL = LogLevel.DEBUG; - private static final String NEWLINE = String.format("%n"); + private static final String NEWLINE = StringUtil.NEWLINE; private static final String[] BYTE2HEX = new String[256]; private static final String[] HEXPADDING = new String[16]; @@ -335,7 +336,7 @@ public class LoggingHandler extends ChannelDuplexHandler { /** * Formats an event and returns the formatted message. This method is currently only used for formatting - * {@link ChannelHandler#connect(ChannelHandlerContext, SocketAddress, SocketAddress, ChannelPromise)}. + * {@link ChannelOutboundHandler#connect(ChannelHandlerContext, SocketAddress, SocketAddress, ChannelPromise)}. * * @param eventName the name of the event * @param firstArg the first argument of the event