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

Browse Source
This commit is contained in:
Redkale
2018-07-27 20:29:13 +08:00
parent e6ef4d1546
commit 0952150328
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/redkale/net/http/WebSocketNode.java
View File

@@ -92,13 +92,13 @@ public abstract class WebSocketNode {
protected abstract CompletableFuture<Integer> broadcastMessage(@RpcTargetAddress InetSocketAddress targetAddress, WebSocketRange wsrange, Object message, boolean last); protected abstract CompletableFuture<Integer> broadcastMessage(@RpcTargetAddress InetSocketAddress targetAddress, WebSocketRange wsrange, Object message, boolean last);
protected abstract CompletableFuture<Void> connect(Serializable userid, @RpcTargetAddress InetSocketAddress addr); protected abstract CompletableFuture<Void> connect(Serializable userid, @RpcTargetAddress InetSocketAddress sncpAddr);
protected abstract CompletableFuture<Void> disconnect(Serializable userid, @RpcTargetAddress InetSocketAddress addr); protected abstract CompletableFuture<Void> disconnect(Serializable userid, @RpcTargetAddress InetSocketAddress sncpAddr);
protected abstract CompletableFuture<Void> changeUserid(Serializable fromuserid, Serializable touserid, @RpcTargetAddress InetSocketAddress addr); protected abstract CompletableFuture<Void> changeUserid(Serializable fromuserid, Serializable touserid, @RpcTargetAddress InetSocketAddress sncpAddr);
protected abstract CompletableFuture<Integer> forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress addr); protected abstract CompletableFuture<Integer> forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress targetAddress);
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
final CompletableFuture<Void> connect(final Serializable userid) { final CompletableFuture<Void> connect(final Serializable userid) {

10
src/org/redkale/service/WebSocketNodeService.java
View File

@@ -56,13 +56,13 @@ public class WebSocketNodeService extends WebSocketNode implements Service {
} }
@Override @Override
public CompletableFuture<Integer> sendMessage(@RpcTargetAddress InetSocketAddress addr, Object message, boolean last, Serializable userid) { public CompletableFuture<Integer> sendMessage(@RpcTargetAddress InetSocketAddress targetAddress, Object message, boolean last, Serializable userid) {
if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY); if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
return this.localEngine.sendMessage(message, last, userid); return this.localEngine.sendMessage(message, last, userid);
} }
@Override @Override
public CompletableFuture<Integer> broadcastMessage(@RpcTargetAddress InetSocketAddress addr, final WebSocketRange wsrange, Object message, boolean last) { public CompletableFuture<Integer> broadcastMessage(@RpcTargetAddress InetSocketAddress targetAddress, final WebSocketRange wsrange, Object message, boolean last) {
if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY); if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
return this.localEngine.broadcastMessage(wsrange, message, last); return this.localEngine.broadcastMessage(wsrange, message, last);
} }
@@ -125,14 +125,14 @@ public class WebSocketNodeService extends WebSocketNode implements Service {
* 强制关闭用户的WebSocket * 强制关闭用户的WebSocket
* *
* @param userid Serializable * @param userid Serializable
* @param sncpAddr InetSocketAddress * @param targetAddress InetSocketAddress
* *
* @return 无返回值 * @return 无返回值
*/ */
@Override @Override
public CompletableFuture<Integer> forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress sncpAddr) { public CompletableFuture<Integer> forceCloseWebSocket(Serializable userid, @RpcTargetAddress InetSocketAddress targetAddress) {
//不能从sncpNodeAddresses中移除，因为engine.forceCloseWebSocket 会调用到disconnect //不能从sncpNodeAddresses中移除，因为engine.forceCloseWebSocket 会调用到disconnect
if (logger.isLoggable(Level.FINEST)) logger.finest(WebSocketNodeService.class.getSimpleName() + ".event: " + userid + " forceCloseWebSocket from " + sncpAddr); if (logger.isLoggable(Level.FINEST)) logger.finest(WebSocketNodeService.class.getSimpleName() + ".event: " + userid + " forceCloseWebSocket from " + targetAddress);
if (localEngine == null) return CompletableFuture.completedFuture(0); if (localEngine == null) return CompletableFuture.completedFuture(0);
return CompletableFuture.completedFuture(localEngine.forceCloseLocalWebSocket(userid)); return CompletableFuture.completedFuture(localEngine.forceCloseLocalWebSocket(userid));
} }