From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Fri, 9 Jun 2017 03:19:04 +0300
Subject: [SDC-29] catalog 1707 rebase commit.

Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>
---
 catalog-be/src/main/resources/config/logback.xml | 106 ++++++++++++++++++++++-
 1 file changed, 104 insertions(+), 2 deletions(-)

(limited to 'catalog-be/src/main/resources/config/logback.xml')

diff --git a/catalog-be/src/main/resources/config/logback.xml b/catalog-be/src/main/resources/config/logback.xml
index 5d5e4c670d..8ba0a31944 100644
--- a/catalog-be/src/main/resources/config/logback.xml
+++ b/catalog-be/src/main/resources/config/logback.xml
@@ -9,7 +9,9 @@
 	<!-- value used by pattern field list (| - is inter-field separator, || - unavailable or not applicable field value) (m - mandatory, o- optional)-->
 	<!--timestamp(m)| requestID(m)| serviceInstanceID(o)| threadID(m)| physicalServerName(o)| serviceName(m)| userID(m)| logLevel(m)| severity(o)| serverIpAddress(m)| serverName(m)| clientIpAddress(o)| className(m)| timer(o)| detailedMessage(o)-->
 	<property name="default-log-pattern"
-		value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{uuid}|%X{serviceInstanceID}|%thread||${ECOMP-subcomponent-name}|%X{userId}|%level|%X{alarmSeverity}|%X{localAddr}|${beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+			  value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{uuid}|%X{serviceInstanceID}|%thread|%X{ServerName}|%X{ServiceName}|${ECOMP-subcomponent-name}|%X{userId}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%level|%X{alarmSeverity}|%X{localAddr}|%X{ElapsedTime}|${beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+
+	<property name="asdc-debug-log-pattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg %n"/>
 
 	<!-- All log -->
 	<if condition='property("enable-all-log").equalsIgnoreCase("true")'>
@@ -113,7 +115,8 @@
 				</expression>
 			</evaluator>
 			<OnMismatch>DENY</OnMismatch>
-			<OnMatch>NEUTRAL</OnMatch>
+			<!--<OnMatch>NEUTRAL</OnMatch>-->
+			<OnMatch>ACCEPT</OnMatch>
 		</filter>
 
 		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
@@ -132,6 +135,52 @@
 		</encoder>
 	</appender>
 
+
+	<!-- ASDC debug by package-->
+	<appender name="PACKAGE_DEBUG_ROLLING"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug_by_package.log
+		</file>
+
+		<!-- No need to deny audit messages - they are INFO only, will be denied
+			anyway -->
+		<!-- Transaction messages filter - deny Transaction messages, there are
+			some DEBUG level messages among them -->
+		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
+				<marker>TRANSACTION_MARKER</marker>
+			</evaluator>
+			<onMismatch>NEUTRAL</onMismatch>
+			<onMatch>DENY</onMatch>
+		</filter>
+
+		<!-- accept DEBUG and TRACE level -->
+		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+			<evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
+				<expression>
+					e.level.toInt() &lt;= DEBUG.toInt()
+				</expression>
+			</evaluator>
+			<OnMismatch>DENY</OnMismatch>
+			<OnMatch>NEUTRAL</OnMatch>
+		</filter>
+
+		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug_by_package.log.%i
+			</fileNamePattern>
+			<minIndex>1</minIndex>
+			<maxIndex>10</maxIndex>
+		</rollingPolicy>
+
+		<triggeringPolicy
+				class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>20MB</maxFileSize>
+		</triggeringPolicy>
+		<encoder>
+			<pattern>${asdc-debug-log-pattern}</pattern>
+		</encoder>
+	</appender>
+
 	<!-- Audit log -->
 	<appender name="AUDIT_ROLLING"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
@@ -143,6 +192,7 @@
 		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
 			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
 				<marker>AUDIT_MARKER</marker>
+				<marker>AUDIT</marker>
 			</evaluator>
 			<onMismatch>DENY</onMismatch>
 			<onMatch>ACCEPT</onMatch>
@@ -163,6 +213,38 @@
 			<pattern>${default-log-pattern}</pattern>
 		</encoder>
 	</appender>
+	
+	<!-- Metrics log -->
+	<appender name="METRICS_ROLLING"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+		<file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/metrics.log
+		</file>
+
+		<!-- Metric messages filter - accept metric messages -->
+		<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+			<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
+				<marker>METRICS</marker>
+			</evaluator>
+			<onMismatch>DENY</onMismatch>
+			<onMatch>ACCEPT</onMatch>
+		</filter>
+
+		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+			<fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/metrics.log.%i
+			</fileNamePattern>
+			<minIndex>1</minIndex>
+			<maxIndex>10</maxIndex>
+		</rollingPolicy>
+
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>20MB</maxFileSize>
+		</triggeringPolicy>
+		<encoder>
+			<pattern>${default-log-pattern}</pattern>
+		</encoder>
+	</appender>
 
 	<!-- SdncTransaction log -->
 	<appender name="TRANSACTION_ROLLING"
@@ -209,12 +291,32 @@
 	      <appender-ref ref="ERROR_ROLLING" />
 	</appender>
 
+	<!-- <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
+		<discriminator class="org.openecomp.core.logging.logback.EventTypeDiscriminator"/>
+		<sift>
+			<appender name="Audit" class="ch.qos.logback.core.rolling.RollingFileAppender">
+				<file>${logDirectory}/audit.log</file>
+				<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+					<fileNamePattern>${logDirectory}/audit.%i.log.zip</fileNamePattern>
+					<minIndex>1</minIndex>
+					<maxIndex>9</maxIndex>
+				</rollingPolicy>
+				<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+					<maxFileSize>5MB</maxFileSize>
+				</triggeringPolicy>
+				<encoder>
+					<pattern>${default-log-pattern}</pattern>
+				</encoder>
+			</appender>
+		</sift>
+	</appender>-->
 
 	<root level="INFO">
 		<appender-ref ref="ASYNC_ERROR" />
 		<appender-ref ref="ASYNC_DEBUG" />
 		<appender-ref ref="AUDIT_ROLLING" />
 		<appender-ref ref="ASYNC_TRANSACTION" />
+		<appender-ref ref="METRICS_ROLLING" />
 		<if condition='property("enable-all-log").equalsIgnoreCase("true")'>
 			<then>
 				<appender-ref ref="ALL_ROLLING" />
-- 
cgit 1.2.3-korg