suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

优化tcp client 关闭时,释放FluxProcessor

This commit is contained in:
zhou-hao 2020-11-30 19:32:57 +08:00
parent fdd5be785c
commit f6dc39a668
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/client/VertxTcpClient.java
View File

@ -48,6 +48,8 @@ public class VertxTcpClient implements TcpClient {
private final FluxSink<TcpMessage> sink = processor.sink(FluxSink.OverflowStrategy.BUFFER);
private final boolean serverClient;
@Override
public void keepAlive() {
lastKeepAliveTime = System.currentTimeMillis();
@ -75,8 +77,9 @@ public class VertxTcpClient implements TcpClient {
return true;
}
public VertxTcpClient(String id) {
public VertxTcpClient(String id,boolean serverClient) {
this.id = id;
this.serverClient=serverClient;
}
protected void received(TcpMessage message) {
@ -136,6 +139,9 @@ public class VertxTcpClient implements TcpClient {
execute(runnable);
}
disconnectListener.clear();
if(serverClient){
processor.onComplete();
}
}
public void setClient(NetClient client) {

2
jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/client/VertxTcpClientProvider.java
View File

@ -43,7 +43,7 @@ public class VertxTcpClientProvider implements NetworkProvider<TcpClientProperti
@Nonnull
@Override
public VertxTcpClient createNetwork(@Nonnull TcpClientProperties properties) {
VertxTcpClient client = new VertxTcpClient(properties.getId());
VertxTcpClient client = new VertxTcpClient(properties.getId(),false);
initClient(client, properties);

2
jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/server/VertxTcpServer.java
View File

@ -81,7 +81,7 @@ public class VertxTcpServer implements TcpServer {
socket.close();
return;
}
VertxTcpClient client = new VertxTcpClient(id + "_" + socket.remoteAddress());
VertxTcpClient client = new VertxTcpClient(id + "_" + socket.remoteAddress(), true);
client.setKeepAliveTimeoutMs(keepAliveTimeout);
try {
socket.exceptionHandler(err -> {