Browse Source
Merge pull request #8325 from volodymyr-babak/edge-log-fix
[3.5] Fixed logging of EdgeGrpcSession
pull/5311/head
Andrew Shvayka
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
5 additions and
4 deletions
-
application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java
|
|
|
@ -670,18 +670,19 @@ public final class EdgeGrpcSession implements Closeable { |
|
|
|
} |
|
|
|
|
|
|
|
private void interruptPreviousSendDownlinkMsgsTask() { |
|
|
|
log.info("[{}]Previous send downlink future was not properly completed, stopping it now!", this.sessionId); |
|
|
|
stopCurrentSendDownlinkMsgsTask(new RuntimeException()); |
|
|
|
String msg = String.format("[%s] Previous send downlink future was not properly completed, stopping it now!", this.sessionId); |
|
|
|
stopCurrentSendDownlinkMsgsTask(new RuntimeException(msg)); |
|
|
|
} |
|
|
|
|
|
|
|
private void interruptGeneralProcessingOnSync(TenantId tenantId, EdgeId edgeId) { |
|
|
|
log.info("[{}][{}][{}] Sync process started. General processing interrupted!", this.sessionId, tenantId, edgeId); |
|
|
|
stopCurrentSendDownlinkMsgsTask(new RuntimeException()); |
|
|
|
String msg = String.format("[%s][%s] Sync process started. General processing interrupted!", tenantId, edgeId); |
|
|
|
stopCurrentSendDownlinkMsgsTask(new RuntimeException(msg)); |
|
|
|
} |
|
|
|
|
|
|
|
public void stopCurrentSendDownlinkMsgsTask(Exception e) { |
|
|
|
if (sessionState.getSendDownlinkMsgsFuture() != null && !sessionState.getSendDownlinkMsgsFuture().isDone()) { |
|
|
|
if (e != null) { |
|
|
|
log.debug(e.getMessage()); |
|
|
|
sessionState.getSendDownlinkMsgsFuture().setException(e); |
|
|
|
} else { |
|
|
|
sessionState.getSendDownlinkMsgsFuture().set(null); |
|
|
|
|