From 57eeff3c12a41b3f509997fc8433c7cd20ecdea1 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Wed, 26 Feb 2020 16:54:46 +0200 Subject: [PATCH 1/2] Stats interval fixes --- .../java/org/thingsboard/server/actors/ActorSystemContext.java | 2 +- .../server/service/script/AbstractNashornJsInvokeService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index cd51e9c6bc..bf06a3a8ac 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java @@ -295,7 +295,7 @@ public class ActorSystemContext { @Getter private final AtomicInteger jsInvokeFailuresCount = new AtomicInteger(0); - @Scheduled(fixedDelayString = "${js.remote.stats.print_interval_ms}") + @Scheduled(fixedDelayString = "${actors.statistics.js_print_interval_ms}") public void printStats() { if (statisticsEnabled) { if (jsInvokeRequestsCount.get() > 0 || jsInvokeResponsesCount.get() > 0 || jsInvokeFailuresCount.get() > 0) { diff --git a/application/src/main/java/org/thingsboard/server/service/script/AbstractNashornJsInvokeService.java b/application/src/main/java/org/thingsboard/server/service/script/AbstractNashornJsInvokeService.java index 6e7d2824f4..e4901785fe 100644 --- a/application/src/main/java/org/thingsboard/server/service/script/AbstractNashornJsInvokeService.java +++ b/application/src/main/java/org/thingsboard/server/service/script/AbstractNashornJsInvokeService.java @@ -70,7 +70,7 @@ public abstract class AbstractNashornJsInvokeService extends AbstractJsInvokeSer @Value("${js.local.stats.enabled:false}") private boolean statsEnabled; - @Scheduled(fixedDelayString = "${js.remote.stats.print_interval_ms:10000}") + @Scheduled(fixedDelayString = "${js.local.stats.print_interval_ms:10000}") public void printStats() { if (statsEnabled) { int pushedMsgs = jsPushedMsgs.getAndSet(0); From e9befd0a50941927269138f28ecca4da62ad4ed4 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Thu, 27 Feb 2020 09:58:29 +0200 Subject: [PATCH 2/2] Docker - update postgres container configuration --- docker/docker-compose.postgres.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.postgres.yml b/docker/docker-compose.postgres.yml index ae615ef636..d47cbd6c37 100644 --- a/docker/docker-compose.postgres.yml +++ b/docker/docker-compose.postgres.yml @@ -19,11 +19,12 @@ version: '2.2' services: postgres: restart: always - image: "postgres:10" + image: "postgres:11.6" ports: - "5432" environment: POSTGRES_DB: thingsboard + POSTGRES_PASSWORD: postgres volumes: - ./tb-node/postgres:/var/lib/postgresql/data tb1: