From b60213dc26540543f500b3442b061565907c3cf8 Mon Sep 17 00:00:00 2001
From: EmmettCox <emmett.cox@est.tech>
Date: Mon, 8 Apr 2019 10:34:31 +0000
Subject: update DR logging to log under one system

Change-Id: I7e21a9c698e49601b090cee350c5a5cc7deb8315
Issue-ID: DMAAP-1050
Signed-off-by: EmmettCox <emmett.cox@est.tech>
---
 .../src/main/resources/log4j.properties            | 68 -------------------
 datarouter-prov/src/main/resources/logback.xml     | 30 +++++----
 .../src/main/resources/misc/log4j.properties.tmpl  | 76 ----------------------
 3 files changed, 17 insertions(+), 157 deletions(-)
 delete mode 100644 datarouter-prov/src/main/resources/log4j.properties
 delete mode 100644 datarouter-prov/src/main/resources/misc/log4j.properties.tmpl

(limited to 'datarouter-prov/src/main/resources')

diff --git a/datarouter-prov/src/main/resources/log4j.properties b/datarouter-prov/src/main/resources/log4j.properties
deleted file mode 100644
index 15ba888b..00000000
--- a/datarouter-prov/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==================================================
-# * org.onap.dmaap
-# * ===========================================================================
-# * Copyright � 2017 AT&T Intellectual Property. All rights reserved.
-# * ===========================================================================
-# * 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====================================================
-# *
-# * ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# *
-#-------------------------------------------------------------------------------
-
-
-log4j.rootLogger=info
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] - %m%n
-
-#
-# Logger used for provisioning events
-#
-log4j.logger.org.onap.dmaap.datarouter.provisioning.events=info, eventlog
-log4j.additivity.org.onap.dmaap.datarouter.provisioning.events=false
-
-log4j.appender.eventlog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.eventlog.file=/root/dr2/logs/provevent.log
-log4j.appender.eventlog.datePattern='.'yyyyMMdd
-log4j.appender.eventlog.append=true
-log4j.appender.eventlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.eventlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
-
-#
-# Logger used for internal provisioning server events
-#
-log4j.logger.org.onap.dmaap.datarouter.provisioning.internal=debug, intlog
-log4j.additivity.org.onap.dmaap.datarouter.provisioning.internal=false
-
-log4j.appender.intlog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.intlog.file=/root/dr2/logs/provint.log
-log4j.appender.intlog.datePattern='.'yyyyMMdd
-log4j.appender.intlog.append=true
-log4j.appender.intlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.intlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
-
-#
-# Logger used for policy engine
-#
-log4j.logger.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=debug, pelog
-log4j.additivity.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=false
-
-log4j.appender.pelog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.pelog.file=/root/dr2/logs/policyengine.log
-log4j.appender.pelog.datePattern='.'yyyyMMdd
-log4j.appender.pelog.append=true
-log4j.appender.pelog.layout=org.apache.log4j.PatternLayout
-log4j.appender.pelog.layout.ConversionPattern=%d %-5p [%t] - %m%n
diff --git a/datarouter-prov/src/main/resources/logback.xml b/datarouter-prov/src/main/resources/logback.xml
index 2a3cd821..afa4df74 100644
--- a/datarouter-prov/src/main/resources/logback.xml
+++ b/datarouter-prov/src/main/resources/logback.xml
@@ -42,13 +42,12 @@
   <!-- name="policyLogName" value="policy"-->
   <property name="errorLogName" value="errors" />
   <!-- name="metricsLogName" value="metrics" -->
-  <!-- name="auditLogName" value="audit" -->
-  <!-- name="debugLogName" value="debug" -->
-  <property name="jettyLogName" value="jetty"></property>
-  <property name="defaultPattern"    value="%d{MM/dd-HH:mm:ss.SSS}|%logger|%X{RequestId}|%X{InvocationId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%msg%n" />
+  <property name="debugLogName" value="debug"/>
+  <property name="jettyLogName" value="jetty"/>
+  <property name="defaultPattern"     value="%d{MM/dd-HH:mm:ss.SSS}|%logger|%X{RequestId}|%X{InvocationId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%msg%n" />
   <property name="jettyLoggerPattern" value="%d{MM/dd-HH:mm:ss.SSS}|%logger|%thread|%.-5level|%msg%n" />
 
-  <property name="debugLoggerPattern" value="%d{MM/dd-HH:mm:ss.SSS}|%X{RequestId}|%X{InvocationId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n" />
+  <property name="debugLoggerPattern" value="%d{MM/dd-HH:mm:ss.SSS}|%logger|%X{RequestId}|%X{InvocationId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n" />
 
   <property name="logDirectory" value="${logDir}" />
   <!-- property name="debugLogDirectory" value="${debugDir}/${componentName}" /-->
@@ -327,12 +326,13 @@
    <!-- ============================================================================ -->
 
 
-   <!--appender name="EELFDebug"
+   <appender name="EELFDebug"
     class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>${debugLogDirectory}/${debugLogName}.log</file>
+    <file>${logDirectory}/${debugLogName}.log</file>
+       <filter class="org.onap.dmaap.datarouter.provisioning.eelf.DebugTraceFilter" />
     <rollingPolicy
       class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-      <fileNamePattern>${debugLogDirectory}/${debugLogName}.%i.log.zip
+      <fileNamePattern>${logDirectory}/${debugLogName}.%i.log.zip
       </fileNamePattern>
       <minIndex>1</minIndex>
       <maxIndex>9</maxIndex>
@@ -342,7 +342,7 @@
       <maxFileSize>5MB</maxFileSize>
     </triggeringPolicy>
     <encoder>
-      <pattern>${debugLoggerPattern}</pattern>
+      <pattern>${defaultPattern}</pattern>
     </encoder>
   </appender>
 
@@ -350,7 +350,7 @@
     <queueSize>256</queueSize>
     <appender-ref ref="EELFDebug" />
     <includeCallerData>true</includeCallerData>
-  </appender-->
+  </appender>
 
 
   <!-- ============================================================================ -->
@@ -368,6 +368,10 @@
         <appender-ref ref="asyncEELFjettylog"/>
     </logger>
 
+    <logger name="com.att.eelf.debug" level="debug" additivity="false">
+        <appender-ref ref="asyncEELFDebug" />
+    </logger>
+
   <!-- logger name="com.att.eelf.security" level="info" additivity="false">
     <appender-ref ref="asyncEELFSecurity" />
   </logger>
@@ -396,10 +400,10 @@
 
 
 
-  <root level="INFO">
+  <root level="TRACE">
     <appender-ref ref="asyncEELF" />
     <appender-ref ref="asyncEELFError" />
-     <appender-ref ref="asyncEELFjettylog" />
-  </root>
+    <appender-ref ref="asyncEELFjettylog" />
+    <appender-ref ref="asyncEELFDebug" />  </root>
 
 </configuration>
diff --git a/datarouter-prov/src/main/resources/misc/log4j.properties.tmpl b/datarouter-prov/src/main/resources/misc/log4j.properties.tmpl
deleted file mode 100644
index 304ee17c..00000000
--- a/datarouter-prov/src/main/resources/misc/log4j.properties.tmpl
+++ /dev/null
@@ -1,76 +0,0 @@
-cat <<!EOF
-# ============LICENSE_START=======================================================
-# org.onap.dmaap
-# ================================================================================
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# 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=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-
-
-log4j.rootLogger=info
-
-#
-# Logger used for provisioning events
-#
-log4j.logger.org.onap.dmaap.datarouter.provisioning.events=info, eventlog
-log4j.additivity.org.onap.dmaap.datarouter.provisioning.events=false
-
-log4j.appender.eventlog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.eventlog.file=${DRTR_PROV_LOGS:-/opt/app/datartr/logs}/provevent.log
-log4j.appender.eventlog.datePattern='.'yyyyMMdd
-log4j.appender.eventlog.append=true
-log4j.appender.eventlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.eventlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
-
-#
-# Logger used for internal provisioning server events
-#
-log4j.logger.org.onap.dmaap.datarouter.provisioning.internal=debug, intlog
-log4j.additivity.org.onap.dmaap.datarouter.provisioning.internal=false
-
-log4j.appender.intlog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.intlog.file=${DRTR_PROV_LOGS:-/opt/app/datartr/logs}/provint.log
-log4j.appender.intlog.datePattern='.'yyyyMMdd
-log4j.appender.intlog.append=true
-log4j.appender.intlog.layout=org.apache.log4j.PatternLayout
-log4j.appender.intlog.layout.ConversionPattern=%d %-5p [%t] - %m%n
-
-#
-# Logger used for policy engine
-#
-log4j.logger.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=debug, pelog
-log4j.additivity.org.onap.dmaap.datarouter.authz.impl.ProvAuthorizer=false
-
-log4j.appender.pelog=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.pelog.file=${DRTR_PROV_LOGS:-/opt/app/datartr/logs}/policyengine.log
-log4j.appender.pelog.datePattern='.'yyyyMMdd
-log4j.appender.pelog.append=true
-log4j.appender.pelog.layout=org.apache.log4j.PatternLayout
-log4j.appender.pelog.layout.ConversionPattern=%d %-5p [%t] - %m%n
-
-#
-# Logger used for Jetty server
-#
-log4j.logger.org.eclipse.jetty=info, jetty
-log4j.additivity.org.eclipse.jetty.server.Server=false
-
-log4j.appender.jetty=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.jetty.file=${DRTR_PROV_LOGS:-/opt/app/datartr/logs}/jetty.log
-log4j.appender.jetty.datePattern='.'yyyyMMdd
-log4j.appender.jetty.append=true
-log4j.appender.jetty.layout=org.apache.log4j.PatternLayout
-log4j.appender.jetty.layout.ConversionPattern=%d %-5p [%t] - %m%n
-!EOF
-- 
cgit 1.2.3-korg