Merge "Logging Compliance as per ONAP"

1 files changed, 78 insertions, 60 deletions

diff --git a/UniversalVesAdapter/src/main/resources/logback.xml b/UniversalVesAdapter/src/main/resources/logback.xml
index c08cd77..d704962 100644
--- a/UniversalVesAdapter/src/main/resources/logback.xml
+++ b/UniversalVesAdapter/src/main/resources/logback.xml
@@ -1,79 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<configuration>
+<!-- /*
+* ============LICENSE_START=======================================================
+* ONAP : DCAE
+* ================================================================================
+* Copyright 2018 TechMahindra
+*=================================================================================
+* 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=========================================================
+*/ -->
 
-	<property name="DEV_HOME" value="logs" />
+<configuration scan="true" scanPeriod="30 seconds">
 
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</Pattern>
+        </layout>
+    </appender>
+    
+	<property name="LOG_DIR" value="logs" />
+    
+    <appender name="metricsAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_DIR}/metrics.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<!-- rollover daily -->
+			<fileNamePattern>${LOG_DIR}/metrics-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<!-- each file should be at most 100MB, keep 2 days worth of history, but at most 200MB -->
+			<maxFileSize>100MB</maxFileSize>
+			<maxHistory>2</maxHistory>
+			<totalSizeCap>200MB</totalSizeCap>
+		</rollingPolicy>
 		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
+			<pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00}|%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00}|NULL|UNKNOWN|%thread||universalvesadpter||||COMPLETE|0|OK||%-5level||||||||||||||%class{36}:%M:%L: %m%n</pattern>
 		</layout>
 	</appender>
-
-	<appender name="FILE-AUDIT"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${DEV_HOME}/debug.log</file>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</encoder>
-
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+	
+	<appender name="debugAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_DIR}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<!-- rollover daily -->
-			<fileNamePattern>${DEV_HOME}/archived/debug.%d{yyyy-MM-dd}.%i.log
-                        </fileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>10MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
+			<fileNamePattern>${LOG_DIR}/debug-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<!-- each file should be at most 100MB, keep 2 days worth of history, but at most 200MB -->
+			<maxFileSize>100MB</maxFileSize>
+			<maxHistory>2</maxHistory>
+			<totalSizeCap>200MB</totalSizeCap>
 		</rollingPolicy>
-
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00}|NULL|%-5level:%class{36}:%M:%L: %m%n</pattern>
+		</layout>
 	</appender>
-
-	<appender name="FILE-ERROR"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-        <level>ERROR</level>
-        <onMatch>ACCEPT</onMatch>
-        <onMismatch>DENY</onMismatch>
-    </filter>
-		<file>${DEV_HOME}/DroppedEvents.log</file>
-		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-			<Pattern>
-				%d{yyyy-MM-dd HH:mm:ss}  %logger{36}   - %msg%n
-			</Pattern>
-		</encoder>
-
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+	
+	<appender name="errorAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${LOG_DIR}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
 			<!-- rollover daily -->
-			<fileNamePattern>${DEV_HOME}/archived/DroppedEvents.%d{yyyy-MM-dd}.%i.log
-                        </fileNamePattern>
-			<timeBasedFileNamingAndTriggeringPolicy
-				class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>10MB</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
+			<fileNamePattern>${LOG_DIR}/error-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<!-- each file should be at most 100MB, keep 2 days worth of history, but at most 200MB -->
+			<maxFileSize>100MB</maxFileSize>
+			<maxHistory>2</maxHistory>
+			<totalSizeCap>200MB</totalSizeCap>
 		</rollingPolicy>
-
+		<layout class="ch.qos.logback.classic.PatternLayout">
+			<pattern>%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00}|NULL|%thread|universalvesadpter||||ERROR|0|ERROR:|%class{36}:%M:%L: %m%n</pattern>
+		</layout>
 	</appender>
 
-	<!-- Send logs to both console and file audit -->
-	<logger name="org.onap.universalvesadapter" level="debug" additivity="false">
-		<appender-ref ref="FILE-AUDIT" />
-		<appender-ref ref="STDOUT" />
+    <logger name="metricsLogger" level="info" additivity="false">
+		<appender-ref ref="metricsAppender" />
 	</logger>
-	 <logger name="org.onap.universalvesadapter.adapter" level="debug" additivity="false">
-		<appender-ref ref="FILE-AUDIT" />
-		<appender-ref ref="FILE-ERROR" />
-		<appender-ref ref="STDOUT" />
-	</logger> -
-	 <!-- <logger name="org.onap.universalvesadapter.adapter" level="error" additivity="false">
-		<appender-ref ref="FILE-ERROR" />
-	</logger> -->
 	
+	<logger name="debugLogger" level="debug" additivity="false">
+		<appender-ref ref="debugAppender" />
+	</logger>
+	
+	<logger name="errorLogger" level="debug" additivity="false">
+		<appender-ref ref="errorAppender" />
+		<appender-ref ref="STDOUT" />
+	</logger>
 
+	<!--<logger name="com" level="INFO"/> -->
 
+	<root level="info">
+		<!-- <appender-ref ref="STDOUT" /> -->
+		<appender-ref ref="debugAppender" />
+	</root>
 	
-
 </configuration>
\ No newline at end of file