lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

text

Browse Source
This commit is contained in:
redkale
2023-10-07 23:16:08 +08:00
parent 0d406530eb
commit fc574a31ff
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/redkale/net/http/WebSocketNode.java
View File

@@ -717,7 +717,7 @@ public abstract class WebSocketNode implements Service {
return ((CompletableFuture) message).thenApply(msg -> sendOneUserMessage(msg, last, userid)); return ((CompletableFuture) message).thenApply(msg -> sendOneUserMessage(msg, last, userid));
} }
if (logger.isLoggable(Level.FINEST)) { if (logger.isLoggable(Level.FINEST)) {
logger.finest("websocket want send message {userid:" + userid + ", content:" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).getTextPayload(): (message instanceof CharSequence ? message : JsonConvert.root().convertTo(message))) + "} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine"); logger.finest("websocket want send message {userid:" + userid + ", content:" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString(): (message instanceof CharSequence ? message : JsonConvert.root().convertTo(message))) + "} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
} }
CompletableFuture<Integer> localFuture = null; CompletableFuture<Integer> localFuture = null;
if (this.localEngine != null) { if (this.localEngine != null) {
@@ -765,7 +765,7 @@ public abstract class WebSocketNode implements Service {
return ((CompletableFuture) message).thenApply(msg -> sendOneAddrMessage(addr, msg, last, userids)); return ((CompletableFuture) message).thenApply(msg -> sendOneAddrMessage(addr, msg, last, userids));
} }
if (logger.isLoggable(Level.FINEST) && this.localEngine == null) { //只打印远程模式的 if (logger.isLoggable(Level.FINEST) && this.localEngine == null) { //只打印远程模式的
logger.finest("websocket want send message {userids:" + JsonConvert.root().convertTo(userids) + ", sncpaddr:" + addr + ", content:" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).getTextPayload() : (message instanceof CharSequence ? message : JsonConvert.root().convertTo(message))) + "} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine"); logger.finest("websocket want send message {userids:" + JsonConvert.root().convertTo(userids) + ", sncpaddr:" + addr + ", content:" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString() : (message instanceof CharSequence ? message : JsonConvert.root().convertTo(message))) + "} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
} }
if (Objects.equals(addr, this.wsNodeAddress)) { if (Objects.equals(addr, this.wsNodeAddress)) {
return this.localEngine == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : localEngine.sendLocalMessage(message, last, userids); return this.localEngine == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : localEngine.sendLocalMessage(message, last, userids);

6
src/main/java/org/redkale/net/http/WebSocketPacket.java
View File

@@ -7,7 +7,6 @@ package org.redkale.net.http;
import java.io.Serializable; import java.io.Serializable;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import org.redkale.convert.ConvertDisabled;
import org.redkale.net.http.WebSocketPacket.FrameType; import org.redkale.net.http.WebSocketPacket.FrameType;
import org.redkale.util.ByteArray; import org.redkale.util.ByteArray;
@@ -106,7 +105,6 @@ public final class WebSocketPacket {
array.put(content); array.put(content);
} }
@ConvertDisabled
public byte[] getPayload() { public byte[] getPayload() {
return payload; return payload;
} }
@@ -131,7 +129,7 @@ public final class WebSocketPacket {
this.last = last; this.last = last;
} }
public String getTextPayload() { public String toSimpleString() {
if (payload == null) { if (payload == null) {
return null; return null;
} }
@@ -140,7 +138,7 @@ public final class WebSocketPacket {
@Override @Override
public String toString() { public String toString() {
return this.getClass().getSimpleName() + "[type=" + type + ", last=" + last + ", payload=" + getTextPayload() + "]"; return this.getClass().getSimpleName() + "[type=" + type + ", last=" + last + ", payload=" + toSimpleString() + "]";
} }
} }