From 1f1590b156d5a3ad86dceb93cf6369770f03ba4c Mon Sep 17 00:00:00 2001 From: vasraz Date: Mon, 25 Apr 2022 22:46:48 +0100 Subject: [PATCH] Replace deprecated GEventEvaluator with JaninoEventEvaluator Change-Id: I21bfd0aaa66a32ecc1755cbe1efd78b0cd4254cf Signed-off-by: Vasyl Razinkov Issue-ID: SDC-3984 --- .../cookbooks/sdc-catalog-be/files/default/logback.xml | 10 ++++------ catalog-be/src/main/resources/config/logback.xml | 10 ++++------ .../cookbooks/sdc-catalog-fe/files/default/FE-logback.xml | 6 ++---- catalog-fe/src/main/resources/config/logback.xml | 6 ++---- .../cookbooks/sdc-onboard-backend/files/default/logback.xml | 6 ++---- .../dist/sdc-onboard-backend-docker/artifacts/logback.xml | 10 ++++------ .../src/main/resources/additional-logback.xml | 6 ++---- .../openecomp-config-lib/src/main/resources/logback.xml | 12 ++++-------- 8 files changed, 24 insertions(+), 42 deletions(-) diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml index 2098836dd3..dc51c16f87 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml @@ -72,10 +72,8 @@ - - - e.level.toInt() <= INFO.toInt() - + + return level <= INFO; DENY ACCEPT @@ -190,12 +188,12 @@ - + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/supportability.log - + SUPPORTABILITY_MARKER diff --git a/catalog-be/src/main/resources/config/logback.xml b/catalog-be/src/main/resources/config/logback.xml index 2098836dd3..dc51c16f87 100644 --- a/catalog-be/src/main/resources/config/logback.xml +++ b/catalog-be/src/main/resources/config/logback.xml @@ -72,10 +72,8 @@ - - - e.level.toInt() <= INFO.toInt() - + + return level <= INFO; DENY ACCEPT @@ -190,12 +188,12 @@ - + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/supportability.log - + SUPPORTABILITY_MARKER diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml index 7ae4438959..452262ece6 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/files/default/FE-logback.xml @@ -107,10 +107,8 @@ - - - e.level.toInt() <= DEBUG.toInt() - + + return level <= DEBUG; DENY NEUTRAL diff --git a/catalog-fe/src/main/resources/config/logback.xml b/catalog-fe/src/main/resources/config/logback.xml index d7c9c7e527..58fd1feb44 100644 --- a/catalog-fe/src/main/resources/config/logback.xml +++ b/catalog-fe/src/main/resources/config/logback.xml @@ -50,10 +50,8 @@ - - - e.level.toInt() <= INFO.toInt() - + + return level <= INFO; DENY ACCEPT 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 @@ - - - e.level.toInt() <= INFO.toInt() - + + return level <= INFO; DENY ACCEPT 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 @@ - - - e.level.toInt() <= INFO.toInt() - + + return level <= INFO; DENY ACCEPT @@ -190,12 +188,12 @@ - + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/supportability.log - + SUPPORTABILITY_MARKER diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml index cec94f17b5..16ece54e76 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/additional-logback.xml @@ -33,10 +33,8 @@ - - - e.level.toInt() <= DEBUG.toInt() - + + return level <= DEBUG; DENY NEUTRAL diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml index 92c486e901..cb9bd06ee3 100644 --- a/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml +++ b/openecomp-be/lib/openecomp-core-lib/openecomp-config-lib/src/main/resources/logback.xml @@ -112,10 +112,8 @@ - - - e.level.toInt() <= DEBUG.toInt() - + + return level <= DEBUG; DENY NEUTRAL @@ -157,10 +155,8 @@ - - - e.level.toInt() <= DEBUG.toInt() - + + return level <= DEBUG; DENY NEUTRAL -- 2.16.6