From 4a0676c9cebd3671c9dd2ec522cdd6aa70e818fd Mon Sep 17 00:00:00 2001
From: niamhcore <niamh.core@est.tech>
Date: Thu, 17 Dec 2020 12:53:50 +0000
Subject: [PATCH] Redirecting logs to console

Issue-ID: CPS-10
Signed-off-by: niamhcore <niamh.core@est.tech>
Change-Id: Ib10a813cf33ad634fc9992b3b3a54a20e2323be1
---
 cps-rest/src/main/resources/logback-spring.xml    | 48 -----------------
 cps-ri/src/main/resources/logback-spring.xml      | 48 -----------------
 cps-service/src/main/resources/logback-spring.xml | 66 ++++++++++++++---------
 3 files changed, 40 insertions(+), 122 deletions(-)
 delete mode 100644 cps-rest/src/main/resources/logback-spring.xml
 delete mode 100644 cps-ri/src/main/resources/logback-spring.xml

diff --git a/cps-rest/src/main/resources/logback-spring.xml b/cps-rest/src/main/resources/logback-spring.xml
deleted file mode 100644
index 8a4ae07c5b..0000000000
--- a/cps-rest/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<configuration scan="true" debug="false">
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-
-    <property name="queueSize" value="256" />
-    <property name="maxFileSize" value="20MB" />
-    <property name="maxHistory" value="30" />
-    <property name="totalSizeCap" value="20MB" />
-
-    <!-- log file names -->
-    <property name="logName" value="cps" />
-
-    <property name="currentTimeStamp" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;,UTC}"/>
-
-    <property name="debugPattern"
-        value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%thread|%X{RequestID}| %logger{50} - %msg%n" />
-
-    <appender name="Debug"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>../log/${logName}.log</file>
-        <rollingPolicy
-            class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip
-            </fileNamePattern>
-            <maxFileSize>${maxFileSize}</maxFileSize>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${debugPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender">
-        <queueSize>256</queueSize>
-        <appender-ref ref="Debug" />
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-    <logger name="org.onap.cps" level="DEBUG" additivity="false">
-        <appender-ref ref="asyncDebug" />
-    </logger>
-
-
-    <root level="INFO">
-        <appender-ref ref="asyncDebug" />
-    </root>
-
-</configuration>
\ No newline at end of file
diff --git a/cps-ri/src/main/resources/logback-spring.xml b/cps-ri/src/main/resources/logback-spring.xml
deleted file mode 100644
index 8a4ae07c5b..0000000000
--- a/cps-ri/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<configuration scan="true" debug="false">
-    <include resource="org/springframework/boot/logging/logback/base.xml" />
-
-    <property name="queueSize" value="256" />
-    <property name="maxFileSize" value="20MB" />
-    <property name="maxHistory" value="30" />
-    <property name="totalSizeCap" value="20MB" />
-
-    <!-- log file names -->
-    <property name="logName" value="cps" />
-
-    <property name="currentTimeStamp" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;,UTC}"/>
-
-    <property name="debugPattern"
-        value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%thread|%X{RequestID}| %logger{50} - %msg%n" />
-
-    <appender name="Debug"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>../log/${logName}.log</file>
-        <rollingPolicy
-            class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip
-            </fileNamePattern>
-            <maxFileSize>${maxFileSize}</maxFileSize>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${debugPattern}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender">
-        <queueSize>256</queueSize>
-        <appender-ref ref="Debug" />
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-    <logger name="org.onap.cps" level="DEBUG" additivity="false">
-        <appender-ref ref="asyncDebug" />
-    </logger>
-
-
-    <root level="INFO">
-        <appender-ref ref="asyncDebug" />
-    </root>
-
-</configuration>
\ No newline at end of file
diff --git a/cps-service/src/main/resources/logback-spring.xml b/cps-service/src/main/resources/logback-spring.xml
index 8a4ae07c5b..04bff86bd2 100644
--- a/cps-service/src/main/resources/logback-spring.xml
+++ b/cps-service/src/main/resources/logback-spring.xml
@@ -14,35 +14,49 @@
     <property name="debugPattern"
         value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%thread|%X{RequestID}| %logger{50} - %msg%n" />
 
-    <appender name="Debug"
-        class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>../log/${logName}.log</file>
-        <rollingPolicy
-            class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip
-            </fileNamePattern>
-            <maxFileSize>${maxFileSize}</maxFileSize>
-            <maxHistory>${maxHistory}</maxHistory>
-            <totalSizeCap>${totalSizeCap}</totalSizeCap>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${debugPattern}</pattern>
-        </encoder>
+    <property name="all-log-pattern"
+      value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%thread|%X{RequestID}| %logger{50} - %msg%n" />
+
+    <appender name="CONSOLE"
+      class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>${all-log-pattern}</Pattern>
+        </layout>
     </appender>
 
-    <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender">
-        <queueSize>256</queueSize>
-        <appender-ref ref="Debug" />
-        <includeCallerData>true</includeCallerData>
-    </appender>
-
-    <logger name="org.onap.cps" level="DEBUG" additivity="false">
-        <appender-ref ref="asyncDebug" />
-    </logger>
-
-
     <root level="INFO">
-        <appender-ref ref="asyncDebug" />
+        <appender-ref ref="CONSOLE" />
     </root>
 
+<!--  Send logs to File & Rotate File  -->
+<!--    <appender name="Debug"-->
+<!--        class="ch.qos.logback.core.rolling.RollingFileAppender">-->
+<!--        <file>../log/${logName}.log</file>-->
+<!--        <rollingPolicy-->
+<!--            class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">-->
+<!--            <fileNamePattern>${logName}.%d{yyyy-MM-dd}.%i.log.zip-->
+<!--            </fileNamePattern>-->
+<!--            <maxFileSize>${maxFileSize}</maxFileSize>-->
+<!--            <maxHistory>${maxHistory}</maxHistory>-->
+<!--            <totalSizeCap>${totalSizeCap}</totalSizeCap>-->
+<!--        </rollingPolicy>-->
+<!--        <encoder>-->
+<!--            <pattern>${debugPattern}</pattern>-->
+<!--        </encoder>-->
+<!--    </appender>-->
+
+<!--    <appender name="asyncDebug" class="ch.qos.logback.classic.AsyncAppender">-->
+<!--        <queueSize>256</queueSize>-->
+<!--        <appender-ref ref="Debug" />-->
+<!--        <includeCallerData>true</includeCallerData>-->
+<!--    </appender>-->
+
+<!--    <logger name="org.onap.cps" level="DEBUG" additivity="false">-->
+<!--        <appender-ref ref="asyncDebug" />-->
+<!--    </logger>-->
+
+<!--    <root level="INFO">-->
+<!--        <appender-ref ref="asyncDebug" />-->
+<!--    </root>-->
+
 </configuration>
\ No newline at end of file
-- 
2.16.6