Merge "Revert "[AAI] Add logs to STDOUT""

[aai/oom.git] / components / aai-resources / resources / config / logback.xml

diff --git a/components/aai-resources/resources/config/logback.xml b/components/aai-resources/resources/config/logback.xml
index f532b4f..ba06414 100644 (file)
--- a/components/aai-resources/resources/config/logback.xml
+++ b/components/aai-resources/resources/config/logback.xml
@@ -5,7 +5,6 @@
     ================================================================================
     Copyright © 2017 AT&T Intellectual Property. All rights reserved.
     Modifications Copyright © 2018 Amdocs, Bell Canada
-       Modifications Copyright © 2020 Samsung Electronics
     ================================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -60,7 +59,9 @@
     <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
        <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
                <encoder>
-                       <pattern>{{ .Values.log.consolePattern.config }}</pattern>
+                       <pattern>
+                               %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
+                       </pattern>
                </encoder>
        </appender>
 
@@ -279,23 +280,23 @@
        </appender>
        <!-- logback internals logging -->
 
-       <logger name="ch.qos.logback.classic" level="{{.Values.logback.loggger.qosLogbackClassic}}" />
-       <logger name="ch.qos.logback.core" level="{{.Values.logback.loggger.qosLogbackCore}}" />
+       <logger name="ch.qos.logback.classic" level="WARN" />
+       <logger name="ch.qos.logback.core" level="WARN" />
 
-       <logger name="com.att.aft.dme2" level="{{.Values.logback.loggger.attAftDme2}}" />
-       <logger name="com.jayway.jsonpath" level="{{.Values.logback.loggger.jaywayJsonpath}}" />
+       <logger name="com.att.aft.dme2" level="WARN" />
+       <logger name="com.jayway.jsonpath" level="WARN" />
 
-       <logger name="org.apache" level="{{.Values.logback.loggger.apache}}" />
-       <logger name="org.apache.commons" level="{{.Values.logback.loggger.apacheCommons}}" />
-       <logger name="org.apache.zookeeper" level="{{.Values.logback.loggger.apacheZookeeper}}" />
-       <logger name="org.codehaus.groovy" level="{{.Values.logback.loggger.codehausGroovy}}" />
-       <logger name="org.eclipse.jetty" level="{{.Values.logback.loggger.eclipseJetty}}" />
+       <logger name="org.apache" level="OFF" />
+       <logger name="org.apache.commons" level="WARN" />
+       <logger name="org.apache.zookeeper" level="OFF" />
+       <logger name="org.codehaus.groovy" level="WARN" />
+       <logger name="org.eclipse.jetty" level="WARN" />
        <!-- Spring related loggers -->
-       <logger name="org.springframework" level="{{.Values.logback.loggger.springframework}}" />
-       <logger name="org.springframework.beans" level="{{.Values.logback.loggger.springframeworkBeans}}" />
-       <logger name="org.springframework.web" level="{{.Values.logback.loggger.springframeworkWeb}}" />
-       <logger name="org.janusgraph" level="{{.Values.logback.loggger.janusgraph}}" />
-       <logger name="org.zookeeper" level="{{.Values.logback.loggger.zookeeper}}" />
+       <logger name="org.springframework" level="WARN" />
+       <logger name="org.springframework.beans" level="WARN" />
+       <logger name="org.springframework.web" level="WARN" />
+       <logger name="org.janusgraph" level="WARN" />
+       <logger name="org.zookeeper" level="OFF" />
 
 
        <logger name="org.onap.aai" level="DEBUG" additivity="false">
@@ -334,7 +335,7 @@
                <appender-ref ref="dmaapAAIEventConsumerInfo" />
        </logger>
 
-       <root level="{{.Values.logback.rootLogLevel.config}}">
+       <root level="DEBUG">
                <appender-ref ref="external" />
                <appender-ref ref="STDOUT" />
        </root>