You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2018/01/17 09:56:34 UTC

[1/2] brooklyn-server git commit: tweak LoggingResourceFilter's logging

Repository: brooklyn-server
Updated Branches:
  refs/heads/master 49bd6c785 -> 469d192db


tweak LoggingResourceFilter's logging


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/108b1bbf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/108b1bbf
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/108b1bbf

Branch: refs/heads/master
Commit: 108b1bbf5cb45a4ac762972e2cef6c3418e03375
Parents: 49bd6c7
Author: Aled Sage <al...@gmail.com>
Authored: Tue Jan 16 15:50:06 2018 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Jan 16 15:50:06 2018 +0000

----------------------------------------------------------------------
 .../org/apache/brooklyn/rest/filter/LoggingResourceFilter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/108b1bbf/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/LoggingResourceFilter.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/LoggingResourceFilter.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/LoggingResourceFilter.java
index 5d9c8f8..397de0e 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/LoggingResourceFilter.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/filter/LoggingResourceFilter.java
@@ -73,7 +73,7 @@ public class LoggingResourceFilter implements ContainerRequestFilter, ContainerR
     private static final Set<String> UNINTERESTING_METHODS = ImmutableSet.of("GET", "HEAD");
 
     /** Headers whose values will not be logged. */
-    private static final Set<String> CENSORED_HEADERS = ImmutableSet.of("Authorization");
+    private static final Set<String> CENSORED_HEADERS = ImmutableSet.of("Authorization", "Cookie");
 
     /** Log all requests that take this time or longer to complete. */
     private static final Duration REQUEST_DURATION_LOG_POINT = Duration.FIVE_SECONDS;
@@ -156,7 +156,7 @@ public class LoggingResourceFilter implements ContainerRequestFilter, ContainerR
         String userName = (userPrincipal != null) ? userPrincipal.getName() : "<no-user>";
         String remoteAddr = servletRequest.getRemoteAddr();
         
-        boolean includeHeaders = (responseContext.getStatus() / 100 == 5) || LOG.isDebugEnabled();
+        boolean includeHeaders = (responseContext.getStatus() / 100 == 5) || LOG.isTraceEnabled();
 
         StringBuilder message = new StringBuilder("Request completed: ")
                 .append("status ")


[2/2] brooklyn-server git commit: This closes #934

Posted by an...@apache.org.
This closes #934


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/469d192d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/469d192d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/469d192d

Branch: refs/heads/master
Commit: 469d192db9bfd65980e36c43b449c44df0d2c187
Parents: 49bd6c7 108b1bb
Author: andreaturli <an...@gmail.com>
Authored: Wed Jan 17 09:56:05 2018 +0000
Committer: andreaturli <an...@gmail.com>
Committed: Wed Jan 17 09:56:05 2018 +0000

----------------------------------------------------------------------
 .../org/apache/brooklyn/rest/filter/LoggingResourceFilter.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------