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

Merge pull request #9818 from smatvienko-tb/fix/TbSqlBlockingQueue_does_not_log_an_error_on_InterruptedException_because_of_normal_lifecycle_

Browse Source 
[3.6.2] TbSqlBlockingQueue does not log an error on InterruptedException because of normal lifecycle
This commit is contained in:
Andrew Shvayka 2023-12-11 18:22:31 +02:00 committed by GitHub
commit 64e330b330
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dao/src/main/java/org/thingsboard/server/dao/sql/TbSqlBlockingQueue.java
View File

@ -84,7 +84,6 @@ public class TbSqlBlockingQueue<E> implements TbSqlQueue<E> {
} }
} }
} catch (Throwable t) { } catch (Throwable t) {
log.error("[{}] Failed to save {} entities", logName, entities.size(), t);
try { try {
stats.incrementFailed(entities.size()); stats.incrementFailed(entities.size());
entities.forEach(entityFutureWrapper -> entityFutureWrapper.getFuture().setException(t)); entities.forEach(entityFutureWrapper -> entityFutureWrapper.getFuture().setException(t));
@ -94,6 +93,8 @@ public class TbSqlBlockingQueue<E> implements TbSqlQueue<E> {
if (t instanceof InterruptedException) { if (t instanceof InterruptedException) {
log.info("[{}] Queue polling was interrupted", logName); log.info("[{}] Queue polling was interrupted", logName);
break; break;
} else {
log.error("[{}] Failed to save {} entities", logName, entities.size(), t);
} }
} finally { } finally {
entities.clear(); entities.clear();