From b695649e124bf3ec0f87a3cf3dfaa4a60ef4131b Mon Sep 17 00:00:00 2001
From: Kai <lukai@chinamobile.com>
Date: Fri, 21 Feb 2020 14:46:06 +0800
Subject: [PATCH] logfile to add debug.log

Issue-ID: DCAEGEN2-2077
Signed-off-by: Kai Lu <lukai@chinamobile.com>
Change-Id: Iecfc328d09f40adf0364c3df0efb3de3d2cf2db5
---
 .../dcae-analytics-tca-web/src/main/resources/logback.xml         | 5 +++--
 .../eelf-logger-logback-impl/src/main/resources/eelf-defaults.xml | 2 +-
 .../eelf-logger-logback-impl/src/main/resources/eelf-logback.xml  | 8 +++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml b/dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml
index 57348d3..5430f0b 100644
--- a/dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/src/main/resources/logback.xml
@@ -39,12 +39,13 @@
     <logger name="org.springframework.retry" level="INFO"/>
     <logger name="org.onap.dcae.analytics" level="INFO"/>
 
-    <root level="INFO">
+    <root level="DEBUG">
         <!-- required appenders -->
         <appender-ref ref="auditLogAppender"/>
         <appender-ref ref="metricLogAppender"/>
         <appender-ref ref="errorLogAppender"/>
-
+        <appender-ref ref="debugLogAppender"/>
+        <appender-ref ref="STDOUT"/>
         <!-- app properties -->
         <appender-ref ref="FILE"/>
     </root>
diff --git a/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-defaults.xml b/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-defaults.xml
index f9bb078..9c4a2cf 100644
--- a/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-defaults.xml
+++ b/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-defaults.xml
@@ -25,7 +25,7 @@
 
     <!-- SETUP LOG DIRECTORIES -->
     <property scope="context" name="logDirectory" value="${logDir}/${componentName}"/>
-    <property scope="context" name="debugLogDirectory" value="${debugDir}/${componentName}"/>
+    <property scope="context" name="debugLogDirectory" value="${logDir}/${componentName}"/>
 
     <!--
     MODIFY LOG DIR ON WINDOWS OS SO THAT TEST LOGS ARE UNDER TARGET DIR CAN BE CLEANED AFTER TESTS AUTOMATICALLY
diff --git a/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-logback.xml b/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-logback.xml
index 7e08eb2..91589fc 100644
--- a/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-logback.xml
+++ b/eelf-logger/eelf-logger-logback-impl/src/main/resources/eelf-logback.xml
@@ -28,7 +28,7 @@
     <include resource="eelf-required-appenders.xml"/>
 
     <!-- ADD OPTIONAL APPENDERS: NOT ADDED BY DEFAULT -->
-    <!--<include resource="eelf-optional-appenders.xml"/>-->
+    <include resource="eelf-optional-appenders.xml"/>
 
 
     <root level="DEBUG">
@@ -36,10 +36,8 @@
         <appender-ref ref="auditLogAppender"/>
         <appender-ref ref="metricLogAppender"/>
         <appender-ref ref="errorLogAppender"/>
-
-        <!-- optional appenders: not added by default -->
-        <!--<appender-ref ref="debugLogAppender"/>-->
-        <!--<appender-ref ref="STDOUT"/>-->
+        <appender-ref ref="debugLogAppender"/>
+        <appender-ref ref="STDOUT"/>
     </root>
 
 </included>
-- 
2.16.6