[unomi] branch master updated: UNOMI-567 : allow to set log level of rest client (#418)

[dg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dgriffon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c69586e2 UNOMI-567 : allow to set log level of rest client (#418)
3c69586e2 is described below

commit 3c69586e2c0d8e4aa12d0fe3ec740b70ff63de80
Author: David Griffon <dg...@jahia.com>
AuthorDate: Mon May 9 11:40:02 2022 +0200

    UNOMI-567 : allow to set log level of rest client (#418)
---
 .../ElasticSearchPersistenceServiceImpl.java              | 15 ++++++++-------
 .../src/main/resources/OSGI-INF/blueprint/blueprint.xml   |  2 +-
 .../org.apache.unomi.persistence.elasticsearch.cfg        |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
index 54adccbac..ad4c32cce 100644
--- a/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
+++ b/persistence-elasticsearch/core/src/main/java/org/apache/unomi/persistence/elasticsearch/ElasticSearchPersistenceServiceImpl.java
@@ -240,7 +240,7 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
     private String itemClassesToCache;
     private boolean useBatchingForSave = false;
     private boolean useBatchingForUpdate = true;
-    private boolean errorLogLevelRestClient = true;
+    private String logLevelRestClient = "ERROR";
     private boolean alwaysOverwrite = true;
     private boolean aggQueryThrowOnMissingDocs = false;
     private Integer aggQueryMaxResponseSizeHttp = null;
@@ -435,17 +435,18 @@ public class ElasticSearchPersistenceServiceImpl implements PersistenceService,
         this.alwaysOverwrite = alwaysOverwrite;
     }
 
-    public void setErrorLogLevelRestClient(boolean errorLogLevelRestClient) {
-        this.errorLogLevelRestClient = errorLogLevelRestClient;
+    public void setLogLevelRestClient(String logLevelRestClient) {
+        this.logLevelRestClient = logLevelRestClient;
     }
 
     public void start() throws Exception {
 
         // Work around to avoid ES Logs regarding the deprecated [ignore_throttled] parameter
-        if (errorLogLevelRestClient) {
-            org.apache.log4j.Logger.getLogger("org.elasticsearch.client.RestClient").setLevel(Level.ERROR);
-        } else {
-            org.apache.log4j.Logger.getLogger("org.elasticsearch.client.RestClient").setLevel(Level.INFO);
+        try {
+            Level lvl = Level.toLevel(logLevelRestClient, Level.ERROR);
+            org.apache.log4j.Logger.getLogger("org.elasticsearch.client.RestClient").setLevel(lvl);
+        } catch (Exception e) {
+            // Never fail because of the set of the logger
         }
 
         // on startup
diff --git a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index fc44ae438..44e0411e6 100644
--- a/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/persistence-elasticsearch/core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -148,7 +148,7 @@
         <property name="sslTrustAllCertificates" value="${es.sslTrustAllCertificates}" />
         <property name="throwExceptions" value="${es.throwExceptions}" />
         <property name="alwaysOverwrite" value="${es.alwaysOverwrite}" />
-        <property name="errorLogLevelRestClient" value="${es.errorLogLevelRestClient}" />
+        <property name="logLevelRestClient" value="${es.logLevelRestClient}" />
     </bean>
 
     <!-- We use a listener here because using the list directly for listening to proxies coming from the same bundle didn't seem to work -->
diff --git a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
index 75d84a470..b996c2a1c 100644
--- a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
+++ b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
@@ -83,4 +83,4 @@ alwaysOverwrite=${org.apache.unomi.elasticsearch.alwaysOverwrite:-true}
 useBatchingForUpdate=${org.apache.unomi.elasticsearch.useBatchingForUpdate:-true}
 
 # ES logging
-errorLogLevelRestClient=${org.apache.unomi.elasticsearch.errorLogLevelRestClient:-true}
+logLevelRestClient=${org.apache.unomi.elasticsearch.logLevelRestClient:-ERROR}