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

startSyncProcess added tenant id and edge id

Browse Source
This commit is contained in:
Volodymyr Babak 2021-05-18 13:49:38 +03:00
parent f5bc5ce111
commit ecc43baed2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcService.java
View File

@ -200,7 +200,7 @@ public class EdgeGrpcService extends EdgeRpcServiceGrpc.EdgeRpcServiceImplBase i
public void startSyncProcess(TenantId tenantId, EdgeId edgeId) { public void startSyncProcess(TenantId tenantId, EdgeId edgeId) {
EdgeGrpcSession session = sessions.get(edgeId); EdgeGrpcSession session = sessions.get(edgeId);
if (session != null && session.isConnected()) { if (session != null && session.isConnected()) {
session.startSyncProcess(); session.startSyncProcess(tenantId, edgeId);
} else { } else {
log.error("[{}] Edge is not connected [{}]", tenantId, edgeId); log.error("[{}] Edge is not connected [{}]", tenantId, edgeId);
throw new RuntimeException("Edge is not connected"); throw new RuntimeException("Edge is not connected");

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

@ -188,7 +188,7 @@ 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(); startSyncProcess(edge.getTenantId(), edge.getId());
} }
syncCompleted = true; syncCompleted = true;
} }
@ -229,12 +229,12 @@ public final class EdgeGrpcSession implements Closeable {
}; };
} }
public void startSyncProcess() { public void startSyncProcess(TenantId tenantId, EdgeId edgeId) {
log.trace("[{}][{}] Staring edge sync process", edge.getTenantId(), edge.getId()); log.trace("[{}][{}] Staring edge sync process", tenantId, edgeId);
syncExecutorService.submit(() -> { syncExecutorService.submit(() -> {
try { try {
startProcessingEdgeEvents(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
startProcessingEdgeEvents(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService())); startProcessingEdgeEvents(new SystemWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
startProcessingEdgeEvents(new TenantWidgetsBundlesEdgeEventFetcher(ctx.getWidgetsBundleService()));
startProcessingEdgeEvents(new DeviceProfilesEdgeEventFetcher(ctx.getDeviceProfileService())); startProcessingEdgeEvents(new DeviceProfilesEdgeEventFetcher(ctx.getDeviceProfileService()));
startProcessingEdgeEvents(new RuleChainsEdgeEventFetcher(ctx.getRuleChainService())); startProcessingEdgeEvents(new RuleChainsEdgeEventFetcher(ctx.getRuleChainService()));