Fix VES Collector logging

Issue-ID: DCAEGEN2-2107
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: Ib13784a5e2d80dd468955c3a0cd69d8debe67218

diff --git a/pom.xml b/pom.xml
index 3f6d32c..650443c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,7 @@
     <sonar.coverage.jacoco.xmlReportPaths>\r
        ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml\r
     </sonar.coverage.jacoco.xmlReportPaths>\r
+    <crypt-password.version>1.3.5</crypt-password.version>\r
   </properties>\r
   <build>\r
     <pluginManagement>\r
@@ -359,12 +360,6 @@
       <groupId>org.springframework.boot</groupId>\r
       <artifactId>spring-boot-starter-log4j2</artifactId>\r
       <version>2.1.5.RELEASE</version>\r
-      <exclusions>\r
-        <exclusion>\r
-          <groupId>org.apache.logging.log4j</groupId>\r
-          <artifactId>log4j-slf4j-impl</artifactId>\r
-        </exclusion>\r
-      </exclusions>\r
     </dependency>\r
     <dependency>\r
       <groupId>io.springfox</groupId>\r
@@ -435,7 +430,12 @@
     <dependency>\r
       <groupId>org.onap.dcaegen2.services.sdk.security.crypt</groupId>\r
       <artifactId>crypt-password</artifactId>\r
-      <version>1.3.1</version>\r
+      <classifier>slim</classifier>\r
+      <version>${crypt-password.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>org.springframework.security</groupId>\r
+      <artifactId>spring-security-crypto</artifactId>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.onap.dcaegen2.services.sdk.standardization</groupId>\r

diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 649441d..e9a0f59 100644 (file)
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -38,7 +38,7 @@
     </RollingFile>
 
     <RollingFile fileName="logs/error.log" filePattern="logs/error-%d{yyyy-MM-dd}-%i.log" name="EFILE">
-      <LevelRangeFilter maxLevel="INFO" minLevel="INFO"/>
+      <LevelRangeFilter maxLevel="ERROR" minLevel="ERROR"/>
       <PatternLayout pattern="[%d{ISO8601}][%-5p][%-10t][%-5c]%m%n"/>
       <Policies>
         <SizeBasedTriggeringPolicy size="64 MB"/>
@@ -66,7 +66,7 @@
 
 
     <RollingFile fileName="logs/eelf/error.log" filePattern="logs/eelf/error-%d{yyyy-MM-dd}-%i.log" name="EELF_ERROR">
-      <LevelRangeFilter maxLevel="WARN" minLevel="WARN"/>
+      <LevelRangeFilter maxLevel="ERROR" minLevel="ERROR"/>
       <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %-5p %m%n"/>
       <Policies>
         <SizeBasedTriggeringPolicy size="64 MB"/>
@@ -90,53 +90,63 @@
 
     <Logger additivity="false" level="info" name="org.onap.dcae.common.input">
       <AppenderRef ref="IFILE"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <Logger additivity="false" level="info" name="org.onap.dcae.common.output">
       <AppenderRef ref="CONSOLE"/>
       <AppenderRef ref="OFILE"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <Logger additivity="false" level="debug" name="org.onap.dcae.common.error">
       <AppenderRef ref="EFILE"/>
       <AppenderRef ref="CONSOLE"/>
       <AppenderRef ref="EELF_ERROR"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <!--NOT USED-->
     <Logger additivity="false" level="info" name="com.att.ecomp.audit">
       <AppenderRef ref="CONSOLE"/>
       <AppenderRef ref="EELF_AUDIT"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <Logger additivity="false" level="info" name="com.att.ecomp.metrics">
       <AppenderRef ref="EELF_METRIC"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <!--NOT USED-->
     <Logger additivity="false" level="info" name="com.att.ecomp.error">
       <AppenderRef ref="EELF_ERROR"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <!--NOT USED-->
     <Logger additivity="false" level="info" name="com.att.ecomp.debug">
       <AppenderRef ref="EELF_DEBUG"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <!--NOT USED-->
     <Logger additivity="false" level="debug" name="org.onap.dcae.common.EventPublisher">
       <AppenderRef ref="CONSOLE"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <!--NOT USED-->
     <Logger additivity="false" level="info" name="com.att.nsa.apiClient.http.HttpClient">
       <AppenderRef ref="CONSOLE"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <!--NOT USED-->
     <Logger additivity="false" level="info"
       name="com.att.nsa.cambria.client.impl.CambriaSimplerBatchPublisher">
       <AppenderRef ref="CONSOLE"/>
+      <AppenderRef ref="ROL_CONSOLE"/>
     </Logger>
 
     <Root additivity="false" level="debug">

diff --git a/version.properties b/version.properties
index d897763..b53fce2 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=5
-patch=3
+patch=4
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT