You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/11/30 02:39:21 UTC
[5/9] james-project git commit: JAMES-2233 Use structured logging for
WebAdmin request/responses
JAMES-2233 Use structured logging for WebAdmin request/responses
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a585dc24
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a585dc24
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a585dc24
Branch: refs/heads/master
Commit: a585dc24072feb6cae9444ee7aa613f30a112b39
Parents: 1cd5c3b
Author: benwa <bt...@linagora.com>
Authored: Tue Nov 28 14:23:04 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Nov 30 09:36:15 2017 +0700
----------------------------------------------------------------------
.../james/webadmin/mdc/LoggingRequestFilter.java | 15 +++++----------
.../james/webadmin/mdc/LoggingResponseFilter.java | 17 ++++++-----------
2 files changed, 11 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/a585dc24/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingRequestFilter.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingRequestFilter.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingRequestFilter.java
index 0087c7b..08a6e5e 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingRequestFilter.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingRequestFilter.java
@@ -19,9 +19,7 @@
package org.apache.james.webadmin.mdc;
-import java.io.Closeable;
-
-import org.apache.james.util.MDCBuilder;
+import org.apache.james.util.MDCStructuredLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,15 +29,12 @@ import spark.Response;
public class LoggingRequestFilter implements Filter {
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingRequestFilter.class);
- private static final String BODY = "body";
+ private static final String REQUEST_BODY = "request-body";
@Override
public void handle(Request request, Response response) throws Exception {
- try (Closeable closeable =
- MDCBuilder.create()
- .addContext(BODY, request.body())
- .build()) {
- LOGGER.info("Received request");
- }
+ MDCStructuredLogger.forLogger(LOGGER)
+ .addField(REQUEST_BODY, request.body())
+ .log(logger -> logger.info("WebAdmin request received"));
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/a585dc24/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingResponseFilter.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingResponseFilter.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingResponseFilter.java
index a72e71e..ebe4ff5 100644
--- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingResponseFilter.java
+++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/mdc/LoggingResponseFilter.java
@@ -19,9 +19,7 @@
package org.apache.james.webadmin.mdc;
-import java.io.Closeable;
-
-import org.apache.james.util.MDCBuilder;
+import org.apache.james.util.MDCStructuredLogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,16 +30,13 @@ import spark.Response;
public class LoggingResponseFilter implements Filter {
private static final Logger LOGGER = LoggerFactory.getLogger(LoggingResponseFilter.class);
private static final String STATUS = "status";
- private static final String BODY = "body";
+ private static final String RESPONSE_BODY = "response-body";
@Override
public void handle(Request request, Response response) throws Exception {
- try (Closeable closeable =
- MDCBuilder.create()
- .addContext(STATUS, response.status())
- .addContext(BODY, response.body())
- .build()) {
- LOGGER.info("Received request");
- }
+ MDCStructuredLogger.forLogger(LOGGER)
+ .addField(STATUS, response.status())
+ .addField(RESPONSE_BODY, response.body())
+ .log(logger -> logger.info("WebAdmin response received"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org