diff options
author | Pawel <pawel.kasperkiewicz@nokia.com> | 2020-03-03 13:22:42 +0100 |
---|---|---|
committer | Pawel <pawel.kasperkiewicz@nokia.com> | 2020-03-11 10:18:12 +0100 |
commit | 52af62a0e21cbaad25897778752752b9e4c2c087 (patch) | |
tree | 4b65114ddbd76addb4e06e41ca17b2166effffff | |
parent | 2921e86e8271fece3283d2179d122f8adcd1d867 (diff) |
Fix VES Collector logging
Issue-ID: DCAEGEN2-2107
Signed-off-by: Pawel <pawel.kasperkiewicz@nokia.com>
Change-Id: Ib13784a5e2d80dd468955c3a0cd69d8debe67218
-rw-r--r-- | pom.xml | 14 | ||||
-rw-r--r-- | src/main/resources/log4j2.xml | 14 | ||||
-rw-r--r-- | version.properties | 2 |
3 files changed, 20 insertions, 10 deletions
@@ -49,6 +49,7 @@ <sonar.coverage.jacoco.xmlReportPaths>
${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
+ <crypt-password.version>1.3.5</crypt-password.version>
</properties>
<build>
<pluginManagement>
@@ -359,12 +360,6 @@ <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
<version>2.1.5.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
@@ -435,7 +430,12 @@ <dependency>
<groupId>org.onap.dcaegen2.services.sdk.security.crypt</groupId>
<artifactId>crypt-password</artifactId>
- <version>1.3.1</version>
+ <classifier>slim</classifier>
+ <version>${crypt-password.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-crypto</artifactId>
</dependency>
<dependency>
<groupId>org.onap.dcaegen2.services.sdk.standardization</groupId>
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 649441d7..e9a0f59c 100644 --- 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 d8977634..b53fce2d 100644 --- 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 |