Commit 57c2915e657e205d7853ed858eaf7898cbd37203

Authored by Igor Kulikov
2 parents e9befd0a 57eeff3c

Merge branch 'master' of github.com:thingsboard/thingsboard

@@ -295,7 +295,7 @@ public class ActorSystemContext { @@ -295,7 +295,7 @@ public class ActorSystemContext {
295 @Getter 295 @Getter
296 private final AtomicInteger jsInvokeFailuresCount = new AtomicInteger(0); 296 private final AtomicInteger jsInvokeFailuresCount = new AtomicInteger(0);
297 297
298 - @Scheduled(fixedDelayString = "${js.remote.stats.print_interval_ms}") 298 + @Scheduled(fixedDelayString = "${actors.statistics.js_print_interval_ms}")
299 public void printStats() { 299 public void printStats() {
300 if (statisticsEnabled) { 300 if (statisticsEnabled) {
301 if (jsInvokeRequestsCount.get() > 0 || jsInvokeResponsesCount.get() > 0 || jsInvokeFailuresCount.get() > 0) { 301 if (jsInvokeRequestsCount.get() > 0 || jsInvokeResponsesCount.get() > 0 || jsInvokeFailuresCount.get() > 0) {
@@ -70,7 +70,7 @@ public abstract class AbstractNashornJsInvokeService extends AbstractJsInvokeSer @@ -70,7 +70,7 @@ public abstract class AbstractNashornJsInvokeService extends AbstractJsInvokeSer
70 @Value("${js.local.stats.enabled:false}") 70 @Value("${js.local.stats.enabled:false}")
71 private boolean statsEnabled; 71 private boolean statsEnabled;
72 72
73 - @Scheduled(fixedDelayString = "${js.remote.stats.print_interval_ms:10000}") 73 + @Scheduled(fixedDelayString = "${js.local.stats.print_interval_ms:10000}")
74 public void printStats() { 74 public void printStats() {
75 if (statsEnabled) { 75 if (statsEnabled) {
76 int pushedMsgs = jsPushedMsgs.getAndSet(0); 76 int pushedMsgs = jsPushedMsgs.getAndSet(0);