Browse Source

Merge pull request #2252 from YevhenBondarenko/feature/fix-logging

added conditions for printing schedule logs
pull/2260/head
Andrew Shvayka 7 years ago
committed by GitHub
parent
commit
7073095ed9
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
  2. 6
      dao/src/main/java/org/thingsboard/server/dao/sql/TbSqlBlockingQueue.java

6
application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java

@ -298,8 +298,10 @@ public class ActorSystemContext {
@Scheduled(fixedDelayString = "${js.remote.stats.print_interval_ms}") @Scheduled(fixedDelayString = "${js.remote.stats.print_interval_ms}")
public void printStats() { public void printStats() {
if (statisticsEnabled) { if (statisticsEnabled) {
log.info("Rule Engine JS Invoke Stats: requests [{}] responses [{}] failures [{}]", if (jsInvokeRequestsCount.get() > 0 || jsInvokeResponsesCount.get() > 0 || jsInvokeFailuresCount.get() > 0) {
jsInvokeRequestsCount.getAndSet(0), jsInvokeResponsesCount.getAndSet(0), jsInvokeFailuresCount.getAndSet(0)); log.info("Rule Engine JS Invoke Stats: requests [{}] responses [{}] failures [{}]",
jsInvokeRequestsCount.getAndSet(0), jsInvokeResponsesCount.getAndSet(0), jsInvokeFailuresCount.getAndSet(0));
}
} }
} }

6
dao/src/main/java/org/thingsboard/server/dao/sql/TbSqlBlockingQueue.java

@ -92,8 +92,10 @@ public class TbSqlBlockingQueue<E> implements TbSqlQueue<E> {
}); });
logExecutor.scheduleAtFixedRate(() -> { logExecutor.scheduleAtFixedRate(() -> {
log.info("[{}] queueSize [{}] totalAdded [{}] totalSaved [{}] totalFailed [{}]", if (queue.size() > 0 || addedCount.get() > 0 || savedCount.get() > 0 || failedCount.get() > 0) {
params.getLogName(), queue.size(), addedCount.getAndSet(0), savedCount.getAndSet(0), failedCount.getAndSet(0)); log.info("[{}] queueSize [{}] totalAdded [{}] totalSaved [{}] totalFailed [{}]",
params.getLogName(), queue.size(), addedCount.getAndSet(0), savedCount.getAndSet(0), failedCount.getAndSet(0));
}
}, params.getStatsPrintIntervalMs(), params.getStatsPrintIntervalMs(), TimeUnit.MILLISECONDS); }, params.getStatsPrintIntervalMs(), params.getStatsPrintIntervalMs(), TimeUnit.MILLISECONDS);
} }

Loading…
Cancel
Save