andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename formatUserMessage to formatSimple and use it in two-args formatter in LoggingHandler

Browse Source
This commit is contained in:
Trustin Lee 2013-12-02 18:57:38 +09:00
parent 0dddec8dfd
commit 99c01aa9f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handler/src/main/java/io/netty/handler/logging/LoggingHandler.java
View File

@ -324,7 +324,7 @@ public class LoggingHandler extends ChannelHandlerAdapter {
} else if (arg instanceof ByteBufHolder) { } else if (arg instanceof ByteBufHolder) {
return formatByteBufHolder(ctx, eventName, (ByteBufHolder) arg); return formatByteBufHolder(ctx, eventName, (ByteBufHolder) arg);
} else { } else {
return formatUserMessage(ctx, eventName, arg); return formatSimple(ctx, eventName, arg);
} }
} }
@ -337,7 +337,7 @@ public class LoggingHandler extends ChannelHandlerAdapter {
*/ */
protected String format(ChannelHandlerContext ctx, String eventName, Object firstArg, Object secondArg) { protected String format(ChannelHandlerContext ctx, String eventName, Object firstArg, Object secondArg) {
if (secondArg == null) { if (secondArg == null) {
return format(ctx, eventName, firstArg); return formatSimple(ctx, eventName, firstArg);
} }
String chStr = ctx.channel().toString(); String chStr = ctx.channel().toString();
@ -473,7 +473,7 @@ public class LoggingHandler extends ChannelHandlerAdapter {
/** /**
* Generates the default log message of the specified event whose argument is an arbitrary object. * Generates the default log message of the specified event whose argument is an arbitrary object.
*/ */
private static String formatUserMessage(ChannelHandlerContext ctx, String eventName, Object msg) { private static String formatSimple(ChannelHandlerContext ctx, String eventName, Object msg) {
String chStr = ctx.channel().toString(); String chStr = ctx.channel().toString();
String msgStr = String.valueOf(msg); String msgStr = String.valueOf(msg);
StringBuilder buf = new StringBuilder(chStr.length() + 1 + eventName.length() + 2 + msgStr.length()); StringBuilder buf = new StringBuilder(chStr.length() + 1 + eventName.length() + 2 + msgStr.length());