From a81d227f1f04d23a17c2ea0a2af2c8f8e476e794 Mon Sep 17 00:00:00 2001 From: Chip Childers Date: Mon, 17 Dec 2012 15:13:59 -0500 Subject: [PATCH] CLOUDSTACK-505: Added string cleaning to the start and end debug log statements within the API servlet. Conflicts: server/src/com/cloud/api/ApiServlet.java --- server/src/com/cloud/api/ApiServlet.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java index 8a1d4de7525..abf29419a72 100755 --- a/server/src/com/cloud/api/ApiServlet.java +++ b/server/src/com/cloud/api/ApiServlet.java @@ -36,6 +36,7 @@ import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.user.AccountService; import com.cloud.user.UserContext; +import com.cloud.utils.StringUtils; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.exception.CloudRuntimeException; @@ -122,6 +123,13 @@ public class ApiServlet extends HttpServlet { // utf8Fixup(req, params); + // logging the request start and end in management log for easy debugging + String reqStr = ""; + if (s_logger.isDebugEnabled()) { + reqStr = auditTrailSb.toString() + " " + req.getQueryString(); + s_logger.debug("===START=== " + StringUtils.cleanString(reqStr)); + } + try { HttpSession session = req.getSession(false); Object[] responseTypeParam = params.get("response"); @@ -335,6 +343,11 @@ public class ApiServlet extends HttpServlet { } } finally { s_accessLogger.info(auditTrailSb.toString()); + + if (s_logger.isDebugEnabled()) { + s_logger.debug("===END=== " + StringUtils.cleanString(reqStr)); + } + // cleanup user context to prevent from being peeked in other request context UserContext.unregisterContext(); }