1 files changed, 9 insertions, 1 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
index d250591e..55a27837 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAdvice.java
@@ -42,11 +42,13 @@ import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.onap.portalsdk.core.domain.User;
 import org.onap.portalsdk.core.logging.format.AuditLogFormatter;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.service.AppService;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
+import org.onap.portalsdk.core.web.support.UserUtils;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -107,7 +109,13 @@ public class EELFLoggerAdvice {
 				MDC.put(className + methodName + SystemProperties.AUDITLOG_BEGIN_TIMESTAMP, getCurrentDateTimeUTC());
 				if (args[0] != null && args[0] instanceof HttpServletRequest) {
 					HttpServletRequest req = (HttpServletRequest) args[0];
-					logger.setRequestBasedDefaultsIntoGlobalLoggingContext(req, appName);
+					String requestId = UserUtils.getRequestId(req);
+					String loginId = "";
+					User user = UserUtils.getUserSession(req);
+					if (user != null) {
+						loginId = user.getLoginId();
+					}
+					logger.setRequestBasedDefaultsIntoGlobalLoggingContext(req, appName, requestId, loginId);
 				}
 			}
 			logger.debug(EELFLoggerDelegate.debugLogger, "{} was invoked.", methodName);