From 1f1590b156d5a3ad86dceb93cf6369770f03ba4c Mon Sep 17 00:00:00 2001
From: vasraz <vasyl.razinkov@est.tech>
Date: Mon, 25 Apr 2022 22:46:48 +0100
Subject: Replace deprecated GEventEvaluator with JaninoEventEvaluator

Change-Id: I21bfd0aaa66a32ecc1755cbe1efd78b0cd4254cf
Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Issue-ID: SDC-3984
---
 .../cookbooks/sdc-onboard-backend/files/default/logback.xml    |  6 ++----
 .../dist/sdc-onboard-backend-docker/artifacts/logback.xml      | 10 ++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'openecomp-be/dist')

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
index 49ae967d7f..e709735fdb 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/logback.xml
@@ -68,10 +68,8 @@
 
         <!-- accept INFO, DEBUG and TRACE level -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                <expression>
-                    e.level.toInt() &lt;= INFO.toInt()
-                </expression>
+            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                <expression>return level &lt;= INFO;</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
index 2098836dd3..dc51c16f87 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
@@ -72,10 +72,8 @@
 
         <!-- accept INFO, DEBUG and TRACE level -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                <expression>
-                    e.level.toInt() &lt;= INFO.toInt()
-                </expression>
+            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
+                <expression>return level &lt;= INFO;</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>
@@ -190,12 +188,12 @@
     </appender>
 
 
-    <!-- Supporability log -->
+    <!-- Supportability log -->
     <appender name="SUPPORTABILITY_ROLLING" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
         <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/supportability.log</file>
 
-        <!-- Supporability messages filter - accept suppportability messages -->
+        <!-- Supportability messages filter - accept supportability messages -->
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
             <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
                 <marker>SUPPORTABILITY_MARKER</marker>
-- 
cgit 1.2.3-korg