use onap logging 1.6.1 with needed workarounds

[vid.git] / epsdk-app-onap / src / main / java / org / onap / portalapp / conf / ExternalAppInitializer.java

diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index dc6973f..0a4e87e 100644 (file)
--- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -37,43 +37,48 @@
  */
 package org.onap.portalapp.conf;
 
-import org.onap.portalsdk.core.conf.AppInitializer;
+import static org.onap.vid.controller.LoggerController.VID_IS_STARTED;
 
 import java.util.TimeZone;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import org.onap.logging.filter.base.AbstractAuditLogFilter;
+import org.onap.logging.filter.base.AbstractMetricLogFilter;
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
+import org.onap.portalsdk.core.conf.AppInitializer;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.slf4j.LoggerFactory;
 
 public class ExternalAppInitializer extends AppInitializer {
 
-       @Override
-       protected Class<?>[] getRootConfigClasses() {
-               return super.getRootConfigClasses();
-       }
+       private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppInitializer.class);
 
        @Override
        protected Class<?>[] getServletConfigClasses() {
                Class<?> appConfigClass = ExternalAppConfig.class;
                // Show something on stdout to indicate the app is starting.
-               System.out.println("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName());
+               LOG.info("ExternalAppInitializer: servlet configuration class is " + appConfigClass.getName());
                return new Class[] { appConfigClass };
        }
 
-       /*
-        * URL request will direct to the Spring dispatcher for processing
-        */
        @Override
-       protected String[] getServletMappings() {
-               return super.getServletMappings();
+       public void onStartup(ServletContext servletContext) throws ServletException {
+               super.onStartup(servletContext);
+               setDefaultTimeZoneToUTC();
+               setPartnerName();
+               logVidIsStarted();
        }
 
-//     @Override
-//     public void onStartup(ServletContext servletContext) throws ServletException {
-//             super.onStartup(servletContext);
-//             setDefaultTimeZoneToUTC();
-//             servletContext.addFilter("requestFromLocalhost", LocalhostFilter.class)
-//                             .addMappingForUrlPatterns(null, false,
-//                                             String.format("/%s/%s/*", ChangeManagementController.CHANGE_MANAGEMENT, ChangeManagementController.VNF_WORKFLOW_RELATION),
-//                                             String.format("/%s/*", RoleGeneratorController.GENERATE_ROLE_SCRIPT),
-//                                             String.format("/%s/*", MaintenanceController.MAINTENANCE));
-//     }
+       //mark in logs that vid is started.
+       private void logVidIsStarted() {
+               LoggerFactory.getLogger(AbstractMetricLogFilter.class).info(ONAPLogConstants.Markers.INVOKE, VID_IS_STARTED);
+               LoggerFactory.getLogger(AbstractAuditLogFilter.class).info(ONAPLogConstants.Markers.ENTRY, VID_IS_STARTED);
+       }
+
+       private void setPartnerName() {
+               //org.onap.logging.filter.base.AbstractMetricLogFilter read this system property
+               System.setProperty("partnerName", "VID.VID");
+       }
 
        //set time zone to UTC so Dates would be written to DB in UTC timezone
        private void setDefaultTimeZoneToUTC() {