Merge "Audit and metric logs contain everything"

1 files changed, 1 insertions, 45 deletions

diff --git a/packages/policy-pap-tarball/src/main/resources/etc/logback.xml b/packages/policy-pap-tarball/src/main/resources/etc/logback.xml
index d4aaf73f..a0761396 100644
--- a/packages/policy-pap-tarball/src/main/resources/etc/logback.xml
+++ b/packages/policy-pap-tarball/src/main/resources/etc/logback.xml
@@ -1,6 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2019 Nordix Foundation.
+   Modifications Copyright (C) 2019 AT&T Intellectual Property.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -26,18 +27,11 @@
     <property name="debugLog" value="debug" />
     <property name="networkLog" value="network" />
 
-    <property name="metricLog" value="metric" />
-    <property name="transactionLog" value="audit" />
-
     <property name="debugPattern"
         value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />
     <property name="errorPattern" value="${debugPattern}" />
     <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />
 
-    <property name="metricPattern"
-        value="%X{RequestID}|%X{InvocationID}|%X{ServiceName}|%X{PartnerName}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{ElapsedTime}|%X{ServiceInstanceID}|%X{VirtualServerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%X{Severity}|%X{TargetEntity}|%X{TargetServiceName}|%X{Server}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ProcessKey}|%X{RemoteHost}|%X{AlertSeverity}|%X{TargetVirtualEntity}|%level|%thread| %msg%n" />
-    <property name="transactionPattern" value="${metricPattern}" />
-
     <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <file>${logDir}/${errorLog}.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
@@ -95,42 +89,6 @@
         <appender-ref ref="NetworkOut" />
     </appender>
 
-    <appender name="MetricOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logDir}/${metricLog}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logDir}/${metricLog}.%d{yyyy-MM-dd}.%i.log.zip
-            </fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>10GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${metricPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="AsyncMetricOut" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="MetricOut" />
-    </appender>
-
-    <appender name="TransactionOut" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${logDir}/${transactionLog}.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logDir}/${transactionLog}.%d{yyyy-MM-dd}.%i.log.zip
-            </fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-            <totalSizeCap>10GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${transactionPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="AsyncTransactionOut" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="TransactionOut" />
-    </appender>
-
     <logger name="network" level="INFO" additivity="false">
         <appender-ref ref="AsyncNetworkOut" />
     </logger>
@@ -142,8 +100,6 @@
     <root level="INFO">
         <appender-ref ref="AsyncDebugOut" />
         <appender-ref ref="AsyncErrorOut" />
-        <appender-ref ref="AsyncMetricOut" />
-        <appender-ref ref="AsyncTransactionOut" />
     </root>
 
 </configuration>