diff options
Diffstat (limited to 'src/main/java/org/openecomp/crud/logging')
-rw-r--r-- | src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java | 41 | ||||
-rw-r--r-- | src/main/java/org/openecomp/crud/logging/LoggingUtil.java | 20 |
2 files changed, 24 insertions, 37 deletions
diff --git a/src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java b/src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java index 98cc4fa..4298709 100644 --- a/src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java +++ b/src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java @@ -30,63 +30,56 @@ import org.openecomp.cl.eelf.LogMessageEnum; public enum CrudServiceMsgs implements LogMessageEnum { /** - * Received request {0} {1} from {2}. Sending response: {3} + * Received request {0} {1} from {2}. Sending response: {3} * - * <p>Arguments: - * {0} = operation - * {1} = target URL - * {2} = source - * {3} = response code + * <p> + * Arguments: {0} = operation {1} = target URL {2} = source {3} = response + * code */ PROCESS_REST_REQUEST, - INVALID_OXM_FILE, - INVALID_OXM_DIR, - OXM_FILE_CHANGED, - TRANSACTION, + INVALID_OXM_FILE, INVALID_OXM_DIR, OXM_FILE_CHANGED, TRANSACTION, /** * Successfully loaded schema: {0} * - * <p>Arguments: - * {0} = oxm filename + * <p> + * Arguments: {0} = oxm filename */ LOADED_OXM_FILE, /** * Unable to load OXM schema: {0} * - * <p>Arguments: - * {0} = error + * <p> + * Arguments: {0} = error */ OXM_LOAD_ERROR, /** * Stopping ChampDAO... * - * <p>Arguments: + * <p> + * Arguments: */ STOPPING_CHAMP_DAO, /** - * Failure instantiating CRUD Rest Service. Cause: {0} + * Failure instantiating CRUD Rest Service. Cause: {0} * - * <p>Arguments: - * {0} - Failure cause. + * <p> + * Arguments: {0} - Failure cause. */ INSTANTIATE_AUTH_ERR, /** - * Arguments: - * {0} Opertaion - * {1} URI - * {2} = Exception + * Arguments: {0} Opertaion {1} URI {2} = Exception */ EXCEPTION_DURING_METHOD_CALL; - /** - * Static initializer to ensure the resource bundles for this class are loaded... + * Static initializer to ensure the resource bundles for this class are + * loaded... */ static { EELFResourceManager.loadMessageBundle("logging/CrudServiceMsgs"); diff --git a/src/main/java/org/openecomp/crud/logging/LoggingUtil.java b/src/main/java/org/openecomp/crud/logging/LoggingUtil.java index 2ef2772..b66a309 100644 --- a/src/main/java/org/openecomp/crud/logging/LoggingUtil.java +++ b/src/main/java/org/openecomp/crud/logging/LoggingUtil.java @@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; - public class LoggingUtil { /** * Initializes mdc context. @@ -61,28 +60,23 @@ public class LoggingUtil { /** * Logs the rest request. */ - public static void logRestRequest(Logger logger, Logger auditLogger, - HttpServletRequest req, Response response) { + public static void logRestRequest(Logger logger, Logger auditLogger, HttpServletRequest req, Response response) { String respStatusString = ""; if (Response.Status.fromStatusCode(response.getStatus()) != null) { respStatusString = Response.Status.fromStatusCode(response.getStatus()).toString(); } // Generate error log - logger.info(CrudServiceMsgs.PROCESS_REST_REQUEST, req.getMethod(), - req.getRequestURL().toString(), req.getRemoteHost(), - Integer.toString(response.getStatus())); + logger.info(CrudServiceMsgs.PROCESS_REST_REQUEST, req.getMethod(), req.getRequestURL().toString(), + req.getRemoteHost(), Integer.toString(response.getStatus())); // Generate audit log. auditLogger.info(CrudServiceMsgs.PROCESS_REST_REQUEST, - new LogFields() - .setField(LogLine.DefinedFields.RESPONSE_CODE, response.getStatus()) + 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: " + (response.getEntity() == null ? "" - : response.getEntity().toString())); + (req != null) ? req.getMethod() : "Unknown", (req != null) ? req.getRequestURL().toString() : "Unknown", + (req != null) ? req.getRemoteHost() : "Unknown", Integer.toString(response.getStatus()) + " payload: " + + (response.getEntity() == null ? "" : response.getEntity().toString())); MDC.clear(); } } |