X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Flogging%2Flogic%2FEPLogUtil.java;h=57b93a20d3c31499398f9f62ea01e0173ed8f5fe;hb=54c5ed82662ef681375675e58abc8058e3203466;hp=364f2959261618c50738aefc7cd2955ae01fbc91;hpb=ce34d843f7e16ecddc839ee9976b4652bfdde571;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/logging/logic/EPLogUtil.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/logging/logic/EPLogUtil.java
index 364f2959..57b93a20 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/logging/logic/EPLogUtil.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/logging/logic/EPLogUtil.java
@@ -38,18 +38,28 @@
 package org.onap.portalapp.portal.logging.logic;
 
 import static com.att.eelf.configuration.Configuration.MDC_ALERT_SEVERITY;
+import static com.att.eelf.configuration.Configuration.MDC_SERVICE_NAME;
 
+import java.net.InetAddress;
 import java.text.MessageFormat;
 
+import org.onap.portalapp.portal.domain.EcompAuditLog;
+import org.onap.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
 import org.onap.portalapp.portal.logging.format.EPAppMessagesEnum;
+import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
+import org.onap.portalapp.portal.utils.EcompPortalUtils;
 import org.onap.portalsdk.core.logging.format.AlarmSeverityEnum;
 import org.onap.portalsdk.core.logging.format.ErrorSeverityEnum;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.util.SystemProperties;
 import org.slf4j.MDC;
 import org.springframework.http.HttpStatus;
 
+import com.att.eelf.configuration.Configuration;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
+import com.att.eelf.configuration.EELFLogger.Level;
+
 
 public class EPLogUtil {
 
@@ -73,44 +83,7 @@ public class EPLogUtil {
 		logEcompError(classLogger, epMessageEnum, null, param);
 	}
 
-	/**
-	 * Formats and writes a message to the error log with the class name and the
-	 * specified parameters, using log level info, warn or error appropriate for
-	 * the specified severity
-	 * 
-	 * @param epMessageEnum
-	 *            Enum carrying alarm and error severity
-	 * @param param
-	 *            Values used to build the message.
-	 */
-	public static void logEcompError(EPAppMessagesEnum epMessageEnum, String... param) {
-		try {
-			AlarmSeverityEnum alarmSeverityEnum = epMessageEnum.getAlarmSeverity();
-			ErrorSeverityEnum errorSeverityEnum = epMessageEnum.getErrorSeverity();
-
-			MDC.put(MDC_ALERT_SEVERITY, alarmSeverityEnum.severity());
-			MDC.put("ErrorCode", epMessageEnum.getErrorCode());
-			MDC.put("ErrorDescription", epMessageEnum.getErrorDescription());
-			MDC.put("ClassName", EPLogUtil.class.getName());
 
-			String resolution = EPLogUtil
-					.formatMessage(epMessageEnum.getDetails() + " " + epMessageEnum.getResolution(), (Object[]) param);
-			if (errorSeverityEnum == ErrorSeverityEnum.WARN) {
-				errorLogger.warn(resolution);
-			} else if (errorSeverityEnum == ErrorSeverityEnum.INFO) {
-				errorLogger.info(resolution);
-			} else {
-				errorLogger.error(resolution);
-			}
-		} catch (Exception e) {
-			errorLogger.error("logEcompError failed", e);
-		} finally {
-			MDC.remove("ErrorCode");
-			MDC.remove("ErrorDescription");
-			MDC.remove("ClassName");
-			MDC.remove(MDC_ALERT_SEVERITY);
-		}
-	}
 
 	/**
 	 * Formats and writes a message to the error log with the class name,
@@ -130,35 +103,43 @@ public class EPLogUtil {
 	@SuppressWarnings("static-access")
 	public static void logEcompError(EELFLoggerDelegate classLogger, EPAppMessagesEnum epMessageEnum, Throwable th,
 			String... param) {
-
+		//INFO, WARN, ERROR, FATAL
 		AlarmSeverityEnum alarmSeverityEnum = epMessageEnum.getAlarmSeverity();
 		ErrorSeverityEnum errorSeverityEnum = epMessageEnum.getErrorSeverity();
 
-		MDC.put(MDC_ALERT_SEVERITY, alarmSeverityEnum.severity());
+		MDC.put("ErrorCategory", errorSeverityEnum.name());
 		MDC.put("ErrorCode", epMessageEnum.getErrorCode());
 		MDC.put("ErrorDescription", epMessageEnum.getErrorDescription());
+		MDC.put(MDC_SERVICE_NAME, EPCommonSystemProperties.ECOMP_PORTAL_BE);
 
 		final String message = EPLogUtil.formatMessage(epMessageEnum.getDetails() + " " + epMessageEnum.getResolution(),
 				(Object[]) param);
 		if (errorSeverityEnum == ErrorSeverityEnum.INFO) {
-			if (th == null)
-				classLogger.info(classLogger.errorLogger, message);
-			else
-				classLogger.info(classLogger.errorLogger, message, th);
+			if (th == null) {
+				classLogger.logWrite(classLogger.errorLogger, Level.INFO, message, null, null);
+			}
+			else {
+				classLogger.logWrite(classLogger.errorLogger, Level.INFO, message, null, th.getMessage());
+			}
 		} else if (errorSeverityEnum == ErrorSeverityEnum.WARN) {
-			if (th == null)
-				classLogger.warn(classLogger.errorLogger, message);
-			else
-				classLogger.warn(classLogger.errorLogger, message, th);
+			if (th == null) {
+				classLogger.logWrite(classLogger.errorLogger, Level.WARN, message, null, null);
+			}
+			else {
+				classLogger.logWrite(classLogger.errorLogger, Level.WARN, message, null, th.getMessage());
+			}
 		} else {
-			if (th == null)
-				classLogger.error(classLogger.errorLogger, message);
-			else
-				classLogger.error(classLogger.errorLogger, message, th);
+			if (th == null) {
+				classLogger.logWrite(classLogger.errorLogger, Level.ERROR, message, null, null);
+			}
+			else {
+				classLogger.logWrite(classLogger.errorLogger, Level.ERROR, message, null, th.getMessage());
+			}
 		}
 
 		// Clean up
-		MDC.remove(MDC_ALERT_SEVERITY);
+		MDC.remove(MDC_SERVICE_NAME);
+		MDC.remove("ErrorCategory");
 		MDC.remove("ErrorCode");
 		MDC.remove("ErrorDescription");
 	}
@@ -181,6 +162,32 @@ public class EPLogUtil {
 		return sbFormattedMessage.toString();
 	}
 
+	public static void logAuditMessage(EELFLoggerDelegate classLogger, String message) {
+		MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+		MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, EPEELFLoggerAdvice.getCurrentDateTimeUTC());
+		EcompPortalUtils.calculateDateTimeDifferenceForLog(
+				MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
+				MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
+		MDC.put("CustomField1", "EXIT");
+		MDC.put("CustomField2", "InvocationID="+MDC.get(Configuration.MDC_KEY_REQUEST_ID));
+		try {
+			MDC.put(Configuration.MDC_SERVER_FQDN, InetAddress.getLocalHost().getCanonicalHostName());
+		} catch (Exception e) {
+			classLogger.logWrite(classLogger.errorLogger, Level.WARN, message, null, " exception while setting IP adress.");
+		}
+		MDC.put(EPCommonSystemProperties.STATUS_CODE, "COMPLETE");
+		
+		classLogger.logWrite(classLogger.auditLogger, Level.INFO, message, null, null);
+		MDC.remove(Configuration.MDC_SERVER_FQDN);
+		MDC.remove(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP);
+		MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
+		MDC.remove(EPCommonSystemProperties.STATUS_CODE);
+		MDC.remove(SystemProperties.MDC_TIMER);
+		MDC.remove("CustomField1");
+		MDC.remove("CustomField2");
+	}
+	
+	
 	/**
 	 * Builds a comma-separated string of values to document a user action.
 	 *