Browse Source

Improved edge rpc session logging

pull/7478/head
Volodymyr Babak 4 years ago
parent
commit
0389513b40
  1. 3
      application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
  2. 20
      application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java
  3. 4
      common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java

3
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java

@ -158,12 +158,13 @@ public final class EdgeGrpcSession implements Closeable {
@Override
public void onError(Throwable t) {
log.error("Failed to deliver message from client!", t);
log.error("[{}] Stream was terminated due to error:", sessionId, t);
closeSession();
}
@Override
public void onCompleted() {
log.info("[{}] Stream was closed and completed successfully!", sessionId);
closeSession();
}

20
application/src/test/java/org/thingsboard/server/edge/imitator/EdgeImitator.java

@ -152,22 +152,18 @@ public class EdgeImitator {
Futures.addCallback(future, new FutureCallback<>() {
@Override
public void onSuccess(@Nullable List<Void> result) {
if (connected) {
DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder()
.setDownlinkMsgId(downlinkMsg.getDownlinkMsgId())
.setSuccess(true).build();
edgeRpcClient.sendDownlinkResponseMsg(downlinkResponseMsg);
}
DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder()
.setDownlinkMsgId(downlinkMsg.getDownlinkMsgId())
.setSuccess(true).build();
edgeRpcClient.sendDownlinkResponseMsg(downlinkResponseMsg);
}
@Override
public void onFailure(Throwable t) {
if (connected) {
DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder()
.setDownlinkMsgId(downlinkMsg.getDownlinkMsgId())
.setSuccess(false).setErrorMsg(t.getMessage()).build();
edgeRpcClient.sendDownlinkResponseMsg(downlinkResponseMsg);
}
DownlinkResponseMsg downlinkResponseMsg = DownlinkResponseMsg.newBuilder()
.setDownlinkMsgId(downlinkMsg.getDownlinkMsgId())
.setSuccess(false).setErrorMsg(t.getMessage()).build();
edgeRpcClient.sendDownlinkResponseMsg(downlinkResponseMsg);
}
}, MoreExecutors.directExecutor());
}

4
common/edge-api/src/main/java/org/thingsboard/edge/rpc/EdgeGrpcClient.java

@ -142,7 +142,7 @@ public class EdgeGrpcClient implements EdgeRpcClient {
@Override
public void onError(Throwable t) {
log.debug("[{}] The rpc session received an error!", edgeKey, t);
log.warn("[{}] Stream was terminated due to error:", edgeKey, t);
try {
EdgeGrpcClient.this.disconnect(true);
} catch (InterruptedException e) {
@ -153,7 +153,7 @@ public class EdgeGrpcClient implements EdgeRpcClient {
@Override
public void onCompleted() {
log.debug("[{}] The rpc session was closed!", edgeKey);
log.info("[{}] Stream was closed and completed successfully!", edgeKey);
}
};
}

Loading…
Cancel
Save