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

优化错误处理

This commit is contained in:
zhou-hao 2020-03-23 10:45:43 +08:00
parent 2ef3add239
commit 2b60d327ab
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jetlinks-components/network-component/mqtt-component/src/main/java/org/jetlinks/community/network/mqtt/gateway/device/MqttServerDeviceGateway.java
View File

@ -32,6 +32,7 @@ import reactor.core.publisher.FluxSink;
import reactor.core.publisher.Mono;
import reactor.util.function.Tuples;
import javax.annotation.Nonnull;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.LongAdder;
import java.util.function.Function;
@ -120,11 +121,11 @@ class MqttServerDeviceGateway implements DeviceGateway , MonitorSupportDeviceGat
con.reject(MqttConnectReturnCode.CONNECTION_REFUSED_IDENTIFIER_REJECTED);
gatewayMonitor.rejected();
}))
.onErrorContinue((err, res) -> {
.onErrorResume((err) -> Mono.fromRunnable(() -> {
gatewayMonitor.rejected();
con.reject(MqttConnectReturnCode.CONNECTION_REFUSED_SERVER_UNAVAILABLE);
log.error("MQTT连接认证[{}]失败", con.getClientId(), err);
}))
})))
.flatMap(tuple3 -> {
counter.increment();
DeviceOperator device = tuple3.getT1();
@ -155,7 +156,7 @@ class MqttServerDeviceGateway implements DeviceGateway , MonitorSupportDeviceGat
}
return Mono.empty();
})
.onErrorContinue((err, res) -> log.error("处理MQTT连接失败", err))
.onErrorResume((err) -> Mono.fromRunnable(() -> log.error("处理MQTT连接失败", err)))
.subscribe(tp -> tp.getT1()
.handleMessage()
.filter(pb -> started.get())
@ -171,6 +172,7 @@ class MqttServerDeviceGateway implements DeviceGateway , MonitorSupportDeviceGat
}
@Override
@Nonnull
public EncodedMessage getMessage() {
return publishing.getMessage();
}
@ -181,9 +183,10 @@ class MqttServerDeviceGateway implements DeviceGateway , MonitorSupportDeviceGat
}
return messageHandler.handleMessage(tp.getT2(), msg);
})
.onErrorContinue((err, res) -> log.error("处理MQTT连接[{}]消息失败:{}", tp.getT2().getDeviceId(), publishing.getMessage(), err)))
.subscribe()
);
.onErrorResume((err) ->
Mono.fromRunnable(() -> log.error("处理MQTT连接[{}]消息失败:{}", tp.getT2().getDeviceId(), publishing.getMessage(), err))
))
.subscribe());
}

13
jetlinks-components/network-component/tcp-component/src/main/java/org/jetlinks/community/network/tcp/device/TcpServerDeviceGateway.java
View File

@ -215,11 +215,14 @@ class TcpServerDeviceGateway implements DeviceGateway, MonitorSupportDeviceGatew
}
return clientMessageHandler.handleMessage(device, message);
}))
.onErrorContinue((err, o) ->
log.error("处理TCP[{}]消息[{}]失败",
clientAddr,
ByteBufUtil.hexDump(tcpMessage.getPayload())
, err)));
.onErrorResume((err) -> {
log.error("处理TCP[{}]消息[{}]失败",
clientAddr,
ByteBufUtil.hexDump(tcpMessage.getPayload())
, err);
return Mono.empty();
}
));
}).subscribe());
}