From: Amichai Hemli <amichai.hemli@intl.att.com>
Date: Thu, 24 Oct 2019 14:28:07 +0000 (+0000)
Subject: Merge "Split Upgrade VF Module tests from viewEdit"
X-Git-Tag: 6.0.1~236
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e63fe3aa29fc637d57f5dbf92dda200685be790b;hp=567c937f57ec575a7c25b7912016970ef138fccd;p=vid.git

Merge "Split Upgrade VF Module tests from viewEdit"
---

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 2c6fcea9d..e4386c150 100644
--- 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,11 +37,16 @@
  */
 package org.onap.portalapp.conf;
 
+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.portalsdk.core.conf.AppInitializer;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.slf4j.LoggerFactory;
 
 public class ExternalAppInitializer extends AppInitializer {
 
@@ -60,6 +65,13 @@ public class ExternalAppInitializer extends AppInitializer {
 		super.onStartup(servletContext);
 		setDefaultTimeZoneToUTC();
 		setPartnerName();
+		logVidIsStarted();
+	}
+
+	//mark in logs that vid is started.
+	private void logVidIsStarted() {
+		LoggerFactory.getLogger(AbstractMetricLogFilter.class).info(VID_IS_STARTED);
+		LoggerFactory.getLogger(AbstractAuditLogFilter.class).info(VID_IS_STARTED);
 	}
 
 	private void setPartnerName() {
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java b/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java
index 48677120d..7233a67e3 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java
@@ -56,6 +56,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class LoggerController extends RestrictedBaseController {
 
     private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(LoggerController.class);
+    public static final String VID_IS_STARTED = "VID is started";
     private RoleProvider roleProvider;
     private LogfilePathCreator logfilePathCreator;
 
@@ -90,7 +91,8 @@ public class LoggerController extends RestrictedBaseController {
 
             return Streams.takeWhile(
                     Stream.generate(reverseLinesSupplier),
-                    line -> !StringUtils.contains(line, "Logging is started"))
+                    line -> !StringUtils.contains(line, "Logging is started") &&
+                            !StringUtils.contains(line, VID_IS_STARTED))
                     .limit(limit)
                     .limit(5_000)
                     .filter(Objects::nonNull)