GEODE-7640: allow tests to turn on management request/response logging (

apache#4553)
mhansonp · Mar 12, 2020 · 10295bb · 10295bb
1 parent 3afb970
commit 10295bb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java b/geode-dunit/src/main/java/org/apache/geode/test/junit/rules/LocatorStarterRule.java
@@ -58,6 +58,11 @@
 public class LocatorStarterRule extends MemberStarterRule<LocatorStarterRule> implements Locator {
   private transient InternalLocator locator;
 
+  public LocatorStarterRule() {
+    // in test environment, enable management request/response logging
+    withSystemProperty("geode.management.request.logging", "true");
+  }
+
   @Override
   public void before() {
     super.before();

diff --git a/...ment/src/main/java/org/apache/geode/management/internal/rest/ManagementLoggingFilter.java b/...ment/src/main/java/org/apache/geode/management/internal/rest/ManagementLoggingFilter.java
@@ -31,13 +31,16 @@
 
 public class ManagementLoggingFilter extends OncePerRequestFilter {
 
+  private static final Boolean ENABLE_REQUEST_LOGGING =
+      Boolean.parseBoolean(System.getProperty("geode.management.request.logging", "false"));
+
   private static int MAX_PAYLOAD_LENGTH = 10000;
 
   @Override
   protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
       FilterChain filterChain) throws ServletException, IOException {
 
-    if (!logger.isDebugEnabled()) {
+    if (!logger.isDebugEnabled() && !ENABLE_REQUEST_LOGGING) {
       filterChain.doFilter(request, response);
       return;
     }
@@ -70,8 +73,17 @@ private void logRequest(HttpServletRequest request, ContentCachingRequestWrapper
     }
     String payload = getContentAsString(wrappedRequest.getContentAsByteArray(),
         wrappedRequest.getCharacterEncoding());
-    logger.debug(String.format(requestPattern, request.getMethod(), requestUrl,
-        request.getRemoteUser(), payload));
+    String message = String.format(requestPattern, request.getMethod(), requestUrl,
+        request.getRemoteUser(), payload);
+    logMessage(message);
+  }
+
+  private void logMessage(String message) {
+    if (ENABLE_REQUEST_LOGGING) {
+      logger.info(message);
+    } else {
+      logger.debug(message);
+    }
   }
 
   private void logResponse(HttpServletResponse response,
@@ -80,8 +92,9 @@ private void logResponse(HttpServletResponse response,
     String responsePattern = "Management Response: Status=%s; response=%s";
     String payload = getContentAsString(wrappedResponse.getContentAsByteArray(),
         wrappedResponse.getCharacterEncoding());
-    logger.debug(String.format(responsePattern, response.getStatus(),
-        ManagementControllerAdvice.removeClassFromJsonText(payload)));
+    String message = String.format(responsePattern, response.getStatus(),
+        ManagementControllerAdvice.removeClassFromJsonText(payload));
+    logMessage(message);
   }
 
   private String getContentAsString(byte[] buf, String encoding) {