dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve GRPC session error handling.

Browse Source
This commit is contained in:
Igor Kulikov 2019-03-29 13:50:52 +02:00
parent 3ab8430a47
commit bc7db03351
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
application/src/main/java/org/thingsboard/server/service/cluster/rpc/GrpcSession.java
View File

@ -95,15 +95,24 @@ public final class GrpcSession implements Closeable {
} }
public void sendMsg(ClusterAPIProtos.ClusterMessage msg) { public void sendMsg(ClusterAPIProtos.ClusterMessage msg) {
outputStream.onNext(msg); if (connected) {
} try {
outputStream.onNext(msg);
public void onError(Throwable t) { } catch (Throwable t) {
outputStream.onError(t); try {
outputStream.onError(t);
} catch (Throwable t2) {
}
listener.onError(GrpcSession.this, t);
}
} else {
log.warn("[{}] Failed to send message due to closed session!", sessionId);
}
} }
@Override @Override
public void close() { public void close() {
connected = false;
try { try {
outputStream.onCompleted(); outputStream.onCompleted();
} catch (IllegalStateException e) { } catch (IllegalStateException e) {

4
pom.xml
View File

@ -61,10 +61,10 @@
<mail.version>1.4.3</mail.version> <mail.version>1.4.3</mail.version>
<curator.version>4.2.0</curator.version> <curator.version>4.2.0</curator.version>
<protobuf.version>3.6.1</protobuf.version> <protobuf.version>3.6.1</protobuf.version>
<grpc.version>1.16.1</grpc.version> <grpc.version>1.19.0</grpc.version>
<lombok.version>1.16.18</lombok.version> <lombok.version>1.16.18</lombok.version>
<paho.client.version>1.1.0</paho.client.version> <paho.client.version>1.1.0</paho.client.version>
<netty.version>4.1.30.Final</netty.version> <netty.version>4.1.34.Final</netty.version>
<os-maven-plugin.version>1.5.0</os-maven-plugin.version> <os-maven-plugin.version>1.5.0</os-maven-plugin.version>
<rabbitmq.version>4.8.0</rabbitmq.version> <rabbitmq.version>4.8.0</rabbitmq.version>
<surfire.version>2.19.1</surfire.version> <surfire.version>2.19.1</surfire.version>