From ea3c6f75e3289a667ca8887dc0b176843517060c Mon Sep 17 00:00:00 2001
From: Filip Krzywka <filip.krzywka@nokia.com>
Date: Wed, 12 Dec 2018 08:11:30 +0100
Subject: Align logback configuration

- followed current logging guidelines in regard of format
- in simulators currently very simple (minimalistic) pattern will
be used as they do not contain any MDCs or Markers
- in main logbacks included three patterns varying on verbosity and
human-readability (for production full logging, ie. ONAP_LOG_PATTERN,
should be used)
- removed logback-test from domain module as it was not enabled anyway
(no dependency on logback) and we should never have need for logging
in this module
- made logback-tests consistent (using simple pattern) except in
component-tests, where it might be useful to have more verbose
output (including MDCs etc.)

Change-Id: Ifd851d12a77d5303b836a25c0e168e18a3a804e9
Issue-ID: DCAEGEN2-1026
Signed-off-by: Filip Krzywka <filip.krzywka@nokia.com>
---
 .../src/test/resources/logback-test.xml            | 54 +++++++++++++---------
 1 file changed, 31 insertions(+), 23 deletions(-)

(limited to 'sources/hv-collector-utils/src/test/resources/logback-test.xml')

diff --git a/sources/hv-collector-utils/src/test/resources/logback-test.xml b/sources/hv-collector-utils/src/test/resources/logback-test.xml
index 9a4eacfe..400b1259 100644
--- a/sources/hv-collector-utils/src/test/resources/logback-test.xml
+++ b/sources/hv-collector-utils/src/test/resources/logback-test.xml
@@ -1,35 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ ============LICENSE_START=======================================================
+  ~ dcaegen2-collectors-veshv
+  ~ ================================================================================
+  ~ Copyright (C) 2018 NOKIA
+  ~ ================================================================================
+  ~ 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=========================================================
+-->
 <configuration>
-  <property name="LOG_FILE"
-    value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}/}ves-hv.log}"/>
-  <property name="FILE_LOG_PATTERN" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC} %-5level [%-40.40logger{10}] - %msg%n"/>
+  <property name="p_tim" value="%date{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
+  <property name="p_lvl" value="%highlight(%-5level)"/>
+  <property name="p_log" value="%50.50logger"/>
+  <property name="SIMPLE_LOG_PATTERN" value="
+%nopexception
+| ${p_tim}\t
+| ${p_log}\t
+| ${p_lvl}\t
+| %msg%n"/>
 
   <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
     <encoder>
-      <pattern>
-        %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX,UTC} %highlight(%-5level) [%-40.40logger{10}] - %msg%n
-      </pattern>
+      <pattern>${SIMPLE_LOG_PATTERN}</pattern>
     </encoder>
   </appender>
 
-    <appender name="ROLLING-FILE"
-      class="ch.qos.logback.core.rolling.RollingFileAppender">
-      <encoder>
-        <pattern>${FILE_LOG_PATTERN}</pattern>
-      </encoder>
-      <file>${LOG_FILE}</file>
-      <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-        <fileNamePattern>${LOG_FILE}.%d{yyyy-MM-dd}.log</fileNamePattern>
-        <maxFileSize>50MB</maxFileSize>
-        <maxHistory>30</maxHistory>
-        <totalSizeCap>10GB</totalSizeCap>
-      </rollingPolicy>
-    </appender>
-
   <logger name="org.onap.dcae.collectors.veshv" level="TRACE"/>
 
   <root level="INFO">
-      <appender-ref ref="CONSOLE"/>
-      <appender-ref ref="ROLLING-FILE"/>
-    </root>
+    <appender-ref ref="CONSOLE"/>
+  </root>
 </configuration>
-- 
cgit 1.2.3-korg