Changing APEX PDP logging similar to other Policy components

Change-Id: I73dcfd581f82b5aa633b1f777166cdd3fa7a3b93
Issue-ID: POLICY-2062
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>

diff --git a/packages/apex-pdp-package-full/src/main/resources/logback.xml b/packages/apex-pdp-package-full/src/main/resources/logback.xml
index b96a376..2b41c94 100644 (file)
--- a/packages/apex-pdp-package-full/src/main/resources/logback.xml
+++ b/packages/apex-pdp-package-full/src/main/resources/logback.xml
@@ -1,64 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-   Copyright (C) 2016-2018 Ericsson. 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.
-  
-  SPDX-License-Identifier: Apache-2.0
-  ============LICENSE_END=========================================================
--->
-
-<configuration debug="false">
-    <statusListener class="ch.qos.logback.core.status.NopStatusListener" />
-
-    <contextName>Apex</contextName>
-    <property name="VAR_LOG" value="/var/log/onap/policy/apex-pdp/" />
-
-    <!-- USE FOR STD OUT ONLY -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <Pattern>%d %contextName [%t] %level %logger{36} - %msg%n</Pattern>
-        </encoder>
-    </appender>
-
-    <root level="info">
-        <appender-ref ref="STDOUT" />
-    </root>
-
-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${VAR_LOG}/apex.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="CTXT_FILE" class="ch.qos.logback.core.FileAppender">
-        <file>${VAR_LOG}/apex_ctxt.log</file>
-        <encoder>
-            <pattern>%d %-5relative [procId=${processId}] [%thread] %-5level
-                %logger{26} - %msg %n %ex{full}</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="org.onap.policy.apex" level="info" additivity="false">
-        <appender-ref ref="STDOUT" />
-        <appender-ref ref="FILE" />
-    </logger>
-
-    <logger name="org.onap.policy.apex.core.context.monitoring" level="TRACE" additivity="false">
-        <appender-ref ref="CTXT_FILE" />
-    </logger>
-
-</configuration>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+  ============LICENSE_START=======================================================\r
+   Copyright (C) 2016-2018 Ericsson. All rights reserved.\r
+   Modifications Copyright (C) 2019 Nordix Foundation.\r
+  ================================================================================\r
+  Licensed under the Apache License, Version 2.0 (the "License");\r
+  you may not use this file except in compliance with the License.\r
+  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+  Unless required by applicable law or agreed to in writing, software\r
+  distributed under the License is distributed on an "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+  See the License for the specific language governing permissions and\r
+  limitations under the License.\r
+\r
+  SPDX-License-Identifier: Apache-2.0\r
+  ============LICENSE_END=========================================================\r
+-->\r
+\r
+<configuration scan="true" scanPeriod="30 seconds" debug="false">\r
+\r
+    <property name="logDir" value="${POLICY_LOGS}" />\r
+\r
+    <property name="errorLog" value="error" />\r
+    <property name="debugLog" value="debug" />\r
+    <property name="networkLog" value="network" />\r
+\r
+    <property name="debugPattern"\r
+        value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%level|%logger{0}|%thread] %msg%n" />\r
+    <property name="errorPattern" value="${debugPattern}" />\r
+    <property name="networkPattern" value="[%d{yyyy-MM-dd'T'HH:mm:ss.SSS+00:00, UTC}|%t]%m%n" />\r
+\r
+    <appender name="ErrorOut" class="ch.qos.logback.core.rolling.RollingFileAppender">\r
+        <file>${logDir}/${errorLog}.log</file>\r
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">\r
+            <fileNamePattern>${logDir}/${errorLog}.%d{yyyy-MM-dd}.%i.log.zip\r
+            </fileNamePattern>\r
+            <maxFileSize>50MB</maxFileSize>\r
+            <maxHistory>30</maxHistory>\r
+            <totalSizeCap>10GB</totalSizeCap>\r
+        </rollingPolicy>\r
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">\r
+            <level>WARN</level>\r
+        </filter>\r
+        <encoder>\r
+            <pattern>${errorPattern}</pattern>\r
+        </encoder>\r
+    </appender>\r
+\r
+    <appender name="AsyncErrorOut" class="ch.qos.logback.classic.AsyncAppender">\r
+        <appender-ref ref="ErrorOut" />\r
+    </appender>\r
+\r
+    <appender name="DebugOut" class="ch.qos.logback.core.rolling.RollingFileAppender">\r
+        <file>${logDir}/${debugLog}.log</file>\r
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">\r
+            <fileNamePattern>${logDir}/${debugLog}.%d{yyyy-MM-dd}.%i.log.zip\r
+            </fileNamePattern>\r
+            <maxFileSize>50MB</maxFileSize>\r
+            <maxHistory>30</maxHistory>\r
+            <totalSizeCap>10GB</totalSizeCap>\r
+        </rollingPolicy>\r
+        <encoder>\r
+            <pattern>${debugPattern}</pattern>\r
+        </encoder>\r
+    </appender>\r
+\r
+    <appender name="AsyncDebugOut" class="ch.qos.logback.classic.AsyncAppender">\r
+        <appender-ref ref="DebugOut" />\r
+    </appender>\r
+\r
+    <appender name="NetworkOut" class="ch.qos.logback.core.rolling.RollingFileAppender">\r
+        <file>${logDir}/${networkLog}.log</file>\r
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">\r
+            <fileNamePattern>${logDir}/${networkLog}.%d{yyyy-MM-dd}.%i.log.zip\r
+            </fileNamePattern>\r
+            <maxFileSize>50MB</maxFileSize>\r
+            <maxHistory>30</maxHistory>\r
+            <totalSizeCap>10GB</totalSizeCap>\r
+        </rollingPolicy>\r
+        <encoder>\r
+            <pattern>${networkPattern}</pattern>\r
+        </encoder>\r
+    </appender>\r
+\r
+    <appender name="AsyncNetworkOut" class="ch.qos.logback.classic.AsyncAppender">\r
+        <appender-ref ref="NetworkOut" />\r
+    </appender>\r
+\r
+    <logger name="network" level="INFO" additivity="false">\r
+        <appender-ref ref="AsyncNetworkOut" />\r
+    </logger>\r
+\r
+    <logger name="org.eclipse.jetty.server.RequestLog" level="info" additivity="false">\r
+        <appender-ref ref="AsyncNetworkOut" />\r
+    </logger>\r
+\r
+    <root level="INFO">\r
+        <appender-ref ref="AsyncDebugOut" />\r
+        <appender-ref ref="AsyncErrorOut" />\r
+    </root>\r
+\r
+</configuration>\r