From cfe79cc4458fd758210362338d7c407d4510ba6a Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Mon, 28 Aug 2023 19:12:33 +0200
Subject: [PATCH] AbstractScriptInvokeService: tenantId added to the log on
 script invocation blocked

---
 .../thingsboard/script/api/AbstractScriptInvokeService.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java b/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java
index ac196a8edd..23274e863d 100644
--- a/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java
+++ b/common/script/script-api/src/main/java/org/thingsboard/script/api/AbstractScriptInvokeService.java
@@ -150,7 +150,7 @@ public abstract class AbstractScriptInvokeService implements ScriptInvokeService
                 }
                 apiUsageReportClient.ifPresent(client -> client.report(tenantId, customerId, ApiUsageRecordKey.JS_EXEC_COUNT, 1));
                 pushedMsgs.incrementAndGet();
-                log.trace("InvokeScript uuid {} with timeout {}ms", scriptId, getMaxInvokeRequestsTimeout());
+                log.trace("[{}] InvokeScript uuid {} with timeout {}ms", tenantId, scriptId, getMaxInvokeRequestsTimeout());
                 var task = doInvokeFunction(scriptId, args);
 
                 var resultFuture = Futures.transformAsync(task.getResultFuture(), output -> {
@@ -167,7 +167,7 @@ public abstract class AbstractScriptInvokeService implements ScriptInvokeService
             } else {
                 String message = "Script invocation is blocked due to maximum error count "
                         + getMaxErrors() + ", scriptId " + scriptId + "!";
-                log.warn(message);
+                log.warn("[{}] " + message, tenantId);
                 return error(message);
             }
         } else {