Merge "Updated champ-lib to use the correct logger"

[aai/champ.git] / champ-service / src / main / java / org / onap / champ / service / logging / LoggingUtil.java

diff --git a/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java b/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java
index 9463f2c..a99be4c 100644 (file)
--- a/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java
+++ b/champ-service/src/main/java/org/onap/champ/service/logging/LoggingUtil.java
@@ -56,6 +56,10 @@ public class LoggingUtil {
 
     MdcContext.initialize(transId, "ChampService", "", fromAppId, fromIp);
   }
+  
+  public static void initMdcContext() {
+    MdcContext.initialize("", "ChampService", "", "", "");
+  }
 
   /**
    * Logs the rest request.
@@ -74,8 +78,8 @@ public class LoggingUtil {
     auditLogger.info(ChampMsgs.PROCESS_REST_REQUEST,
         new LogFields().setField(LogLine.DefinedFields.RESPONSE_CODE, response.getStatus())
             .setField(LogLine.DefinedFields.RESPONSE_DESCRIPTION, respStatusString),
-        (req != null) ? req.getMethod() : "Unknown", (req != null) ? req.getRequestURL().toString() : "Unknown",
-        (req != null) ? req.getRemoteHost() : "Unknown", Integer.toString(response.getStatus()) + " payload: "
+        req.getMethod(), req.getRequestURL().toString(),
+        req.getRemoteHost(), Integer.toString(response.getStatus()) + " payload: "
             + (response.getEntity() == null ? "" : response.getEntity().toString()));
     MDC.clear();
   }