X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcomponents%2Faai-traversal%2Fresources%2Fconfig%2Flocalhost-access-logback.xml;h=5e3a15c66a33fe35b2c2c9b8b2f84b5ad94cbc44;hb=refs%2Fheads%2Fmaster;hp=4cf6c7433330fe347b16935a0b7e98afd8887e98;hpb=7007041548231606f3a2f0f98419d43619340bda;p=oom.git

diff --git a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml
index 4cf6c74333..5e3a15c66a 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml
+++ b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml
@@ -1,16 +1,16 @@
-<!--
-
+{{/*<!--
     ============LICENSE_START=======================================================
     org.onap.aai
     ================================================================================
     Copyright © 2017 AT&T Intellectual Property. All rights reserved.
     Modifications Copyright © 2018 Amdocs, Bell Canada
+    Modifications Copyright © 2020 Orange
     ================================================================================
     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
+        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,
@@ -18,27 +18,61 @@
     See the License for the specific language governing permissions and
     limitations under the License.
     ============LICENSE_END=========================================================
+-->
+*/}}
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+  <property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
+  <property name="maxHistory" value='{{.Values.accessLogback.maxHistory}}' />
+  <property name="totalSizeCap" value='{{.Values.accessLogback.totalSizeCap}}' />
+  <property name="logToFileEnabled" value='{{.Values.accessLogback.logToFileEnabled}}' />
+  <property name="livenessAccessLogEnabled"
+    value='{{.Values.accessLogback.livenessAccessLogEnabled}}' />
 
-    ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  <if condition='property("logToFileEnabled").contains("true")'>
+    <then>
+      <appender name="ACCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+          <fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
+          </fileNamePattern>
+          <maxHistory>${maxHistory}</maxHistory>
+          <totalSizeCap>${totalSizeCap}</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
+          <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId}
+            %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU}
+            %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST}
+            %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter}
+            %i{X-AAI-SSL-Client-DN} %D</Pattern>
+        </encoder>
+      </appender>
+      <appender-ref ref="ACCESS" />
+    </then>
+  </if>
 
--->
-<configuration>
-	<property name="AJSC_HOME" value="${AJSC_HOME:-.}" />
-	<appender name="ACCESS"
-		class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<fileNamePattern>${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}
-			</fileNamePattern>
-		</rollingPolicy>
-		<encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
-			<Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D</Pattern>
-		</encoder>
-	</appender>
-	<appender-ref ref="ACCESS" />
+  <appender name="STDOUTACCESS" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder class="org.onap.aai.logging.CustomLogPatternLayoutEncoder">
+      <Pattern>%a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId}
+        %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O}
+        %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C}
+        %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D -
+        "logType": "access"</Pattern>
+    </encoder>
+    <if condition='property("livenessAccessLogEnabled").contains("false")'>
+      <then>
+        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
+          <evaluator class="ch.qos.logback.access.net.URLEvaluator">
+            <URL>/aai/util/echo</URL>
+          </evaluator>
+          <OnMismatch>NEUTRAL</OnMismatch>
+          <OnMatch>DENY</OnMatch>
+        </filter>
+      </then>
+    </if>
+  </appender>
+  <appender-ref ref="STDOUTACCESS" />
 </configuration>
-
-<!-- 
+{{/*<!--
 %a - Remote IP address
 %A - Local IP address
 %b - Bytes sent, excluding HTTP headers, or '-' if no bytes were sent
@@ -60,4 +94,4 @@
 
 %z - Custom pattern that parses the cert for the subject
 %y - Custom pattern determines rest or dme2
- -->
+-->*/}}
\ No newline at end of file