From 5f0757a3a6d584de82731eaa247fc1c3c9f46b55 Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Fri, 27 Apr 2018 14:38:45 +0200 Subject: [PATCH] Remove poliyc errors Attempt to remove policy errors that are dumped to logs when exception are raised too. This led to duplicate errors in logs Issue-ID: CLAMP-153 Change-Id: Ibba491d9ecf1fc99d4c09f5b80f7701fc4f56654 Signed-off-by: Determe, Sebastien (sd378r) --- .../clamp/clds/client/req/policy/PolicyClient.java | 2 +- src/main/resources/logback.xml | 5 +++ src/main/resources/policyLogger.properties | 47 ---------------------- 3 files changed, 6 insertions(+), 48 deletions(-) delete mode 100644 src/main/resources/policyLogger.properties diff --git a/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java b/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java index 79088962..c00d7de8 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java +++ b/src/main/java/org/onap/clamp/clds/client/req/policy/PolicyClient.java @@ -330,7 +330,7 @@ public class PolicyClient { } else { policyName = prop.getCurrentPolicyScopeAndFullPolicyName(policyNamePrefix); } - logger.info("policyName=" + policyName); + logger.info("Search in Policy Engine for policyName=" + policyName); configRequestParameters.setPolicyName(policyName); try { Collection response = getPolicyEngine().getConfig(configRequestParameters); diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index b898998c..a740520f 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -130,6 +130,11 @@ + + + + + diff --git a/src/main/resources/policyLogger.properties b/src/main/resources/policyLogger.properties deleted file mode 100644 index 7e59dec0..00000000 --- a/src/main/resources/policyLogger.properties +++ /dev/null @@ -1,47 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ONAP CLAMP -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. -# ================================================================================ -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ============LICENSE_END============================================ -# =================================================================== -# -### - -################################### Set concurrentHashMap and timer info ####################### -#Timer initial delay and the delay between in milliseconds before task is to be execute. -timer.delay.time=1000 -#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions. -check.interval= 30000 -#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds. -event.expired.time=86400 -#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed -#to remove all expired records from this concurrentHashMap. -concurrentHashMap.limit=5000 -#Size of the concurrentHashMap - when its size drops to this point, stop the Timer -stop.check.point=2500 -################################### Set logging format ############################################# -# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println -logger.type=EELF -#################################### Set level for EELF or SYSTEMOUT logging ################################## -# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all -debugLogger.level=INFO -# Set level for metrics file. Set OFF to disable; set ON to enable -metricsLogger.level=ON -# Set level for error file. Set OFF to disable; set ON to enable -error.level=ON -# Set level for audit file. Set OFF to disable; set ON to enable -audit.level=ON \ No newline at end of file -- 2.16.6