test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-01 19:38:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

节点升级 socket 锁调整

Browse Source
This commit is contained in:
bwcx_jzy 2021-09-18 23:01:25 +08:00
parent 410637e1eb
commit 33eb189ab0
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/server/src/main/java/io/jpom/socket/client/NodeClient.java
View File

@ -63,7 +63,7 @@ public class NodeClient extends WebSocketClient {
public void onMessage(String message) {
try {
// 不能并发向同一个客户端发送消息 @author jzy 2021-08-03
synchronized (NodeUpdateHandler.class) {
synchronized (session.getId()) {
session.sendMessage(new TextMessage(message));
}
} catch (IOException e) {

16
modules/server/src/main/java/io/jpom/socket/handler/NodeUpdateHandler.java
View File

@ -71,12 +71,14 @@ public class NodeUpdateHandler extends BaseProxyHandler {
Map<String, Object> attributes = session.getAttributes();
String url = NodeForward.getSocketUrl(model, NodeUrl.NodeUpdate, (UserModel) attributes.get("userInfo"));
// 连接节点
try {
NodeClient client = new NodeClient(url, model, session);
clientMap.put(model.getId(), client);
} catch (Exception e) {
DefaultSystemLog.getLog().error("创建插件端连接失败", e);
}
ThreadUtil.execute(() -> {
try {
NodeClient client = new NodeClient(url, model, session);
clientMap.put(model.getId(), client);
} catch (Exception e) {
DefaultSystemLog.getLog().error("创建插件端连接失败", e);
}
});
}
}
@ -190,7 +192,7 @@ public class NodeUpdateHandler extends BaseProxyHandler {
private void sendMsg(WebSocketMessageModel model, WebSocketSession session) {
try {
synchronized (NodeUpdateHandler.class) {
synchronized (session.getId()) {
session.sendMessage(new TextMessage(model.toString()));
}
} catch (Exception e) {