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

Sync completed flag correctly updated

Browse Source
This commit is contained in:
Volodymyr Babak 2021-06-24 18:49:37 +03:00
parent c85aea31a0
commit f2b8886c9b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
View File

@ -158,8 +158,9 @@ public final class EdgeGrpcSession implements Closeable {
if (connected && requestMsg.getMsgType().equals(RequestMsgType.SYNC_REQUEST_RPC_MESSAGE)) { if (connected && requestMsg.getMsgType().equals(RequestMsgType.SYNC_REQUEST_RPC_MESSAGE)) {
if (requestMsg.getSyncRequestMsg().getSyncRequired()) { if (requestMsg.getSyncRequestMsg().getSyncRequired()) {
startSyncProcess(edge.getTenantId(), edge.getId()); startSyncProcess(edge.getTenantId(), edge.getId());
} else {
syncCompleted = true;
} }
syncCompleted = true;
} }
if (connected) { if (connected) {
if (requestMsg.getMsgType().equals(RequestMsgType.UPLINK_RPC_MESSAGE) && requestMsg.hasUplinkMsg()) { if (requestMsg.getMsgType().equals(RequestMsgType.UPLINK_RPC_MESSAGE) && requestMsg.hasUplinkMsg()) {
@ -228,6 +229,8 @@ public final class EdgeGrpcSession implements Closeable {
.setSyncCompletedMsg(SyncCompletedMsg.newBuilder().build()) .setSyncCompletedMsg(SyncCompletedMsg.newBuilder().build())
.build(); .build();
sendDownlinkMsgsPack(Collections.singletonList(syncCompleteDownlinkMsg)); sendDownlinkMsgsPack(Collections.singletonList(syncCompleteDownlinkMsg));
syncCompleted = true;
} catch (Exception e) { } catch (Exception e) {
log.error("[{}][{}] Exception during sync process", edge.getTenantId(), edge.getId(), e); log.error("[{}][{}] Exception during sync process", edge.getTenantId(), edge.getId(), e);
} }