From b403f2228463c92cb1ac966c83b513da60b66cb2 Mon Sep 17 00:00:00 2001 From: Redkale <22250530@qq.com> Date: Sat, 31 Mar 2018 10:46:21 +0800 Subject: [PATCH] --- src/org/redkale/net/http/WebSocketNode.java | 4 +++- src/org/redkale/net/http/WebSocketPacket.java | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/org/redkale/net/http/WebSocketNode.java b/src/org/redkale/net/http/WebSocketNode.java index 4b178ff55..ffa2242d4 100644 --- a/src/org/redkale/net/http/WebSocketNode.java +++ b/src/org/redkale/net/http/WebSocketNode.java @@ -484,7 +484,9 @@ public abstract class WebSocketNode { private CompletableFuture sendOneMessage(final Object message, final boolean last, final Serializable userid) { if (message instanceof CompletableFuture) return ((CompletableFuture) message).thenApply(msg -> sendOneMessage(msg, last, userid)); - if (logger.isLoggable(Level.FINEST)) logger.finest("websocket want send message {userid:" + userid + ", content:'" + JsonConvert.root().convertTo(message) + "'} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine"); + if (logger.isLoggable(Level.FINEST)) { + logger.finest("websocket want send message {userid:" + userid + ", content:'" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString() : JsonConvert.root().convertTo(message)) + "'} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine"); + } CompletableFuture localFuture = null; if (this.localEngine != null) localFuture = localEngine.sendMessage(message, last, userid); if (this.sncpNodeAddresses == null || this.remoteNode == null) { diff --git a/src/org/redkale/net/http/WebSocketPacket.java b/src/org/redkale/net/http/WebSocketPacket.java index 274d11ff1..b4771c7c2 100644 --- a/src/org/redkale/net/http/WebSocketPacket.java +++ b/src/org/redkale/net/http/WebSocketPacket.java @@ -202,6 +202,12 @@ public final class WebSocketPacket { this.last = last; } + public String toSimpleString() { + if (payload != null) return payload; + if (bytes != null) return "byte[" + bytes.length + "]"; + return this.toString(); + } + @Override public String toString() { return this.getClass().getSimpleName() + "[type=" + type + ", last=" + last + (payload != null ? (", payload=" + payload) : "") + (bytes != null ? (", bytes=[" + bytes.length + ']') : (receiveLength > 0 ? (", receivemsg=" + (receiveMessage instanceof byte[] ? ("byte[" + ((byte[]) receiveMessage).length + "]") : receiveMessage)) : "")) + (sendJson != null ? (", json=" + (sendMapconvable ? Utility.ofMap((Object[]) sendJson) : sendJson)) : "") + "]";