From 3c72d0d608daf61a50b319b73293a81346263a46 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 11 May 2021 08:01:21 +0300
Subject: [PATCH] log WARN for onScriptExecutionError to prevent silent ban
 (actually, system going to idle if the script is a part of a rule chain).
 restored TRACE level on fetchAndProcessResponses

---
 .../service/script/AbstractJsInvokeService.java | 17 ++++++++++-------
 .../common/DefaultTbQueueRequestTemplate.java   |  6 ++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java b/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java
index b089f52e76..dc01e0d97e 100644
--- a/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/script/AbstractJsInvokeService.java
@@ -121,13 +121,16 @@ public abstract class AbstractJsInvokeService implements JsInvokeService {
     protected abstract long getMaxBlacklistDuration();
 
     protected void onScriptExecutionError(UUID scriptId, Throwable t) {
-        if (t instanceof TimeoutException || (t.getCause() != null && t.getCause() instanceof TimeoutException)) {
-            log.warn("Script has TimeoutException and will increment counter {} on disabledFunctions for id {}", //TODO remove after test
-                    disabledFunctions.computeIfAbsent(scriptId, key -> new DisableListInfo()).get(),
-                    scriptId);
-            //return; //timeout is not a good reason to disable function
-        }
-        disabledFunctions.computeIfAbsent(scriptId, key -> new DisableListInfo()).incrementAndGet();
+        DisableListInfo disableListInfo = disabledFunctions.computeIfAbsent(scriptId, key -> new DisableListInfo());
+        log.warn("Script has exception and will increment counter {} on disabledFunctions for id {}, exception {}, cause {}",
+                disableListInfo.get(), scriptId, t.getClass(), t.getCause());
+//        if (t instanceof TimeoutException || (t.getCause() != null && t.getCause() instanceof TimeoutException)) {
+//            log.warn("Script has TimeoutException and will increment counter {} on disabledFunctions for id {}", //TODO remove after test
+//                    disableListInfo.get(),
+//                    scriptId);
+//            //return; //timeout is not a good reason to disable function
+//        }
+        disableListInfo.incrementAndGet();
     }
 
     private String generateJsScript(JsScriptType scriptType, String functionName, String scriptBody, String... argNames) {
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
index a385ef17a8..abeb739160 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
@@ -109,11 +109,9 @@ public class DefaultTbQueueRequestTemplate<Request extends TbQueueMsg, Response
 
     void fetchAndProcessResponses() {
         final long pendingRequestsCount = pendingRequests.mappingCount();
-        log.info("Starting template pool topic {}, for pendingRequests {}", responseTemplate.getTopic(), pendingRequestsCount);
+        log.trace("Starting template pool topic {}, for pendingRequests {}", responseTemplate.getTopic(), pendingRequestsCount);
         List<Response> responses = doPoll(); //poll js responses
-        //if (responses.size() > 0) {
-        log.info("Completed template poll topic {}, for pendingRequests [{}], received [{}]", responseTemplate.getTopic(), pendingRequestsCount, responses.size()); //TODO reduce verbose after test
-        //}
+        log.trace("Completed template poll topic {}, for pendingRequests [{}], received [{}] responses", responseTemplate.getTopic(), pendingRequestsCount, responses.size());
         responses.forEach(this::processResponse); //this can take a long time
         responseTemplate.commit();
         tryCleanStaleRequests();