Merge "Logging Updates for logback.xml files and Servlet"

12 files changed, 37 insertions, 33 deletions

diff --git a/aai-resources/bundleconfig-local/etc/appprops/createDBSchema-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/createDBSchema-logback.xml
index 41cfb4f..0bb4a7e 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/createDBSchema-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/createDBSchema-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/createDBSchema/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder  class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/createDBSchema/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/createDBSchema/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/dataGrooming-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/dataGrooming-logback.xml
index 072c6f2..05beb0d 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/dataGrooming-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/dataGrooming-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/dataGrooming/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/dataGrooming/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/dataGrooming/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/dataSnapshot-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/dataSnapshot-logback.xml
index 58cf01d..ce1d672 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/dataSnapshot-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/dataSnapshot-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/dataSnapshot/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/dataSnapshot/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/dataSnapshot/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/deltool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/deltool-logback.xml
index 6a70d4a..9b91956 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/deltool-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/deltool-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/delTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/delTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/delTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/getres-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/getres-logback.xml
index 3b14ca2..bb66ed5 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/getres-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/getres-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/getTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/getTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/getTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/posttool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/posttool-logback.xml
index a03713b..f0db38c 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/posttool-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/posttool-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/postTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/postTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/postTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/prov-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/prov-logback.xml
index 3f0a7da..3c59734 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/prov-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/prov-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/provTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/provTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/provTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/pullInvData-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/pullInvData-logback.xml
index 6691b91..93dd6ad 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/pullInvData-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/pullInvData-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/pullInvData/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/pullInvData/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/pullInvData/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/puttool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/puttool-logback.xml
index 8c74ae5..e99b297 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/puttool-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/puttool-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/putTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/putTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/putTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/rshiptool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/rshiptool-logback.xml
index 4fe87ca..3d499c8 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/rshiptool-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/rshiptool-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/rshipTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/rshipTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/rshipTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/bundleconfig-local/etc/appprops/updtool-logback.xml b/aai-resources/bundleconfig-local/etc/appprops/updtool-logback.xml
index 2dd9f11..a16efce 100644
--- a/aai-resources/bundleconfig-local/etc/appprops/updtool-logback.xml
+++ b/aai-resources/bundleconfig-local/etc/appprops/updtool-logback.xml
@@ -11,7 +11,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/updTool/error.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -26,7 +26,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/updTool/debug.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfLogPattern}</pattern>
 		</encoder>
 	</appender>
@@ -41,7 +41,7 @@
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<fileNamePattern>${logDirectory}/updTool/metrics.log.%d{yyyy-MM-dd}</fileNamePattern>
 		</rollingPolicy>
-		<encoder>
+		<encoder class="org.openecomp.aai.logging.EcompEncoder">
 			<pattern>${eelfMetricLogPattern}</pattern>
 		</encoder>
 	</appender>
diff --git a/aai-resources/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java b/aai-resources/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java
index 3184da8..c32eb12 100644
--- a/aai-resources/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java
+++ b/aai-resources/src/main/java/org/openecomp/aai/util/AAIAppServletContextListener.java
@@ -85,5 +85,9 @@ public class AAIAppServletContextListener implements ServletContextListener {
 			LOGGER.error("Unknown failure while initializing A&AI Server", e);
 			throw new RuntimeException("Unknown failure while initializing A&AI server", e);
 		}
+
+		LOGGER.info("Resources MicroService Started");
+		LOGGER.error("Resources MicroService Started");
+		LOGGER.debug("Resources MicroService Started");
 	}
 }