This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push: new 1a4f9d3a49 Improved: Reduction of recurring INFO logs (OFBIZ-12830) (#645) 1a4f9d3a49 is described below commit 1a4f9d3a49f82a86ee3f5e0fe95215d9725bcae3 Author: cshan-ecomify <117295991+cshan-ecom...@users.noreply.github.com> AuthorDate: Mon Jun 19 14:46:11 2023 +0200 Improved: Reduction of recurring INFO logs (OFBIZ-12830) (#645) Thanks @cshan-ecomify, we can support more alike. --- .../content/groovyScripts/permission/ContentPermissionServices.groovy | 4 ++-- .../common/groovyScripts/permission/CommonPermissionServices.groovy | 2 +- .../src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/content/groovyScripts/permission/ContentPermissionServices.groovy b/applications/content/groovyScripts/permission/ContentPermissionServices.groovy index f43482179e..20e584fa33 100644 --- a/applications/content/groovyScripts/permission/ContentPermissionServices.groovy +++ b/applications/content/groovyScripts/permission/ContentPermissionServices.groovy @@ -67,7 +67,7 @@ Map genericContentPermission() { // mainAction based call outs if (hasPermission) { - logInfo("Admin permission found: ${parameters.primaryPermission}_${mainAction}") + logVerbose("Admin permission found: ${parameters.primaryPermission}_${mainAction}") } else { switch (parameters.mainAction) { case 'VIEW': @@ -88,7 +88,7 @@ Map genericContentPermission() { hasPermission = serviceUCP.hasPermission ?: false } // all other actions use main base check } - logInfo("Permission service [${mainAction} / ${parameters.contentId}] completed; returning hasPermission = ${hasPermission}") + logVerbose("Permission service [${mainAction} / ${parameters.contentId}] completed; returning hasPermission = ${hasPermission}") return success(hasPermission: hasPermission) } diff --git a/framework/common/groovyScripts/permission/CommonPermissionServices.groovy b/framework/common/groovyScripts/permission/CommonPermissionServices.groovy index 7e53c5f1a6..9032b48a4b 100644 --- a/framework/common/groovyScripts/permission/CommonPermissionServices.groovy +++ b/framework/common/groovyScripts/permission/CommonPermissionServices.groovy @@ -38,7 +38,7 @@ Map genericBasePermissionCheck() { String altPermission = parameters.altPermission String altPermissionList = '' if (altPermission) { - logInfo("Checking for alternate permission ${altPermission}_${mainAction}") + logVerbose("Checking for alternate permission ${altPermission}_${mainAction}") altPermissionList = ", ${altPermission}_${mainAction}, ${altPermission}_ADMIN" } // altPermission is not a required field; no need to add Error diff --git a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java index 97e221f72b..caa8a855f5 100644 --- a/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java +++ b/framework/service/src/main/java/org/apache/ofbiz/service/eca/ServiceEcaRule.java @@ -135,8 +135,8 @@ public final class ServiceEcaRule implements java.io.Serializable { boolean allCondTrue = true; for (ServiceEcaCondition ec: conditions) { if (!ec.eval(serviceName, dctx, context)) { - if (Debug.infoOn()) { - Debug.logInfo("For Service ECA [" + this.serviceName + "] on [" + this.eventName + "] got false for condition: " + ec, MODULE); + if (Debug.verboseOn()) { + Debug.logVerbose("For Service ECA [" + this.serviceName + "] on [" + this.eventName + "] got false for condition: " + ec, MODULE); } allCondTrue = false; break;