You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/09/22 06:13:44 UTC
[1/4] logging-log4j-audit git commit: [LOG4J2-2420] fix parameter
logging
Repository: logging-log4j-audit
Updated Branches:
refs/heads/master 7660899fc -> 83b9afa43
[LOG4J2-2420] fix parameter logging
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/390cbe97
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/390cbe97
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/390cbe97
Branch: refs/heads/master
Commit: 390cbe9798a617eafc7102ecd629da8ea4751266
Parents: c2bfa53
Author: Andrei Ivanov <an...@arnia.ro>
Authored: Mon Sep 17 11:32:48 2018 +0300
Committer: Andrei Ivanov <an...@arnia.ro>
Committed: Mon Sep 17 11:32:48 2018 +0300
----------------------------------------------------------------------
.../org/apache/logging/log4j/audit/rest/RequestContextFilter.java | 2 +-
.../logging/log4j/audit/rest/RequestContextHandlerInterceptor.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/390cbe97/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
index 28f922a..02acf60 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
@@ -79,7 +79,7 @@ public class RequestContextFilter implements Filter {
if (servletRequest instanceof HttpServletRequest) {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
- logger.info("Starting request {}" + request.getRequestURI());
+ logger.info("Starting request {}", request.getRequestURI());
try {
Enumeration headers = request.getHeaderNames();
while (headers.hasMoreElements()) {
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/390cbe97/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
index 173461a..aed3124 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
@@ -44,7 +44,7 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception {
- logger.info("Starting request {}" + request.getRequestURI());
+ logger.info("Starting request {}", request.getRequestURI());
Enumeration headers = request.getHeaderNames();
while (headers.hasMoreElements()) {
String name = (String) headers.nextElement();
[4/4] logging-log4j-audit git commit: LOG4J2-2420 -
RequestContextFilter logging cleanup
Posted by rg...@apache.org.
LOG4J2-2420 - RequestContextFilter logging cleanup
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/83b9afa4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/83b9afa4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/83b9afa4
Branch: refs/heads/master
Commit: 83b9afa43f9eac5ce61c3d6c5c535fd7f5143100
Parents: 446bedb
Author: Ralph Goers <rg...@apache.org>
Authored: Fri Sep 21 20:12:44 2018 -1000
Committer: Ralph Goers <rg...@apache.org>
Committed: Fri Sep 21 20:12:44 2018 -1000
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/83b9afa4/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index e0495ad..b3e265a 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="1.0.1" date="YYYY-MM-DD" description="Release 1.0.1">
+ <action issue="LOG4J2-2420" dev="rgoers" type="fix" due-to="Andrei Ivanov">
+ RequestContextFilter logging cleanup.
+ </action>
<action issue="LOG4J2-2442" dev="rgoers" type="fix" due-to="Andrei Ivanov">
Normalize the event names logged through AbstractEventLogger.logEvent.
</action>
[2/4] logging-log4j-audit git commit: [LOG4J2-2420] switch the
logging of request processing duration to TRACE level
Posted by rg...@apache.org.
[LOG4J2-2420] switch the logging of request processing duration to TRACE level
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/e333cda8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/e333cda8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/e333cda8
Branch: refs/heads/master
Commit: e333cda808ffd3472477bdf48c119fcf256d3970
Parents: 390cbe9
Author: Andrei Ivanov <an...@arnia.ro>
Authored: Mon Sep 17 11:41:42 2018 +0300
Committer: Andrei Ivanov <an...@arnia.ro>
Committed: Mon Sep 17 11:41:42 2018 +0300
----------------------------------------------------------------------
.../log4j/audit/rest/RequestContextFilter.java | 21 ++++++++++++-------
.../rest/RequestContextHandlerInterceptor.java | 22 ++++++++++++--------
2 files changed, 26 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/e333cda8/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
index 02acf60..f60263b 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextFilter.java
@@ -79,11 +79,11 @@ public class RequestContextFilter implements Filter {
if (servletRequest instanceof HttpServletRequest) {
HttpServletRequest request = (HttpServletRequest) servletRequest;
HttpServletResponse response = (HttpServletResponse) servletResponse;
- logger.info("Starting request {}", request.getRequestURI());
+ logger.trace("Starting request {}", request.getRequestURI());
try {
- Enumeration headers = request.getHeaderNames();
+ Enumeration<String> headers = request.getHeaderNames();
while (headers.hasMoreElements()) {
- String name = (String) headers.nextElement();
+ String name = headers.nextElement();
RequestContextMapping mapping = mappings.getMappingByHeader(name);
logger.debug("Got Mapping:{} for Header:{}", mapping, name);
if (mapping != null) {
@@ -99,12 +99,17 @@ public class RequestContextFilter implements Filter {
}
}
}
- long start = System.nanoTime();
+ long start = 0;
+ if (logger.isTraceEnabled()) {
+ start = System.nanoTime();
+ }
filterChain.doFilter(servletRequest, servletResponse);
- long elapsed = System.nanoTime() - start;
- StringBuilder sb = new StringBuilder("Request ").append(request.getRequestURI()).append(" completed in ");
- ElapsedUtil.addElapsed(elapsed, sb);
- logger.info(sb.toString());
+ if (logger.isTraceEnabled()) {
+ long elapsed = System.nanoTime() - start;
+ StringBuilder sb = new StringBuilder("Request ").append(request.getRequestURI()).append(" completed in ");
+ ElapsedUtil.addElapsed(elapsed, sb);
+ logger.trace(sb.toString());
+ }
} catch (Throwable e) {
logger.error("Application cascaded error", e);
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/blob/e333cda8/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
index aed3124..114dbf5 100644
--- a/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
+++ b/log4j-audit/log4j-audit-api/src/main/java/org/apache/logging/log4j/audit/rest/RequestContextHandlerInterceptor.java
@@ -44,10 +44,10 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception {
- logger.info("Starting request {}", request.getRequestURI());
- Enumeration headers = request.getHeaderNames();
+ logger.trace("Starting request {}", request.getRequestURI());
+ Enumeration<String> headers = request.getHeaderNames();
while (headers.hasMoreElements()) {
- String name = (String) headers.nextElement();
+ String name = headers.nextElement();
RequestContextMapping mapping = mappings.getMappingByHeader(name);
logger.debug("Got Mapping:{} for Header:{}", mapping, name);
if (mapping != null) {
@@ -63,17 +63,21 @@ public class RequestContextHandlerInterceptor implements HandlerInterceptor {
}
}
}
- startTime.set(System.nanoTime());
+ if (logger.isTraceEnabled()) {
+ startTime.set(System.nanoTime());
+ }
return true;
}
@Override
public void postHandle(HttpServletRequest request, HttpServletResponse response, Object o, ModelAndView modelAndView) throws Exception {
- long elapsed = System.nanoTime() - startTime.get();
- StringBuilder sb = new StringBuilder("Request ").append(request.getRequestURI()).append(" completed in ");
- ElapsedUtil.addElapsed(elapsed, sb);
- logger.info(sb.toString());
- startTime.remove();
+ if (logger.isTraceEnabled()) {
+ long elapsed = System.nanoTime() - startTime.get();
+ StringBuilder sb = new StringBuilder("Request ").append(request.getRequestURI()).append(" completed in ");
+ ElapsedUtil.addElapsed(elapsed, sb);
+ logger.trace(sb.toString());
+ startTime.remove();
+ }
}
@Override
[3/4] logging-log4j-audit git commit: Closes #6
Posted by rg...@apache.org.
Closes #6
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/commit/446bedb1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/tree/446bedb1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-audit/diff/446bedb1
Branch: refs/heads/master
Commit: 446bedb15a3fb8b4d9c6b7f3ea5db96081d6753a
Parents: 7660899 e333cda
Author: Ralph Goers <rg...@apache.org>
Authored: Fri Sep 21 20:11:07 2018 -1000
Committer: Ralph Goers <rg...@apache.org>
Committed: Fri Sep 21 20:11:07 2018 -1000
----------------------------------------------------------------------
.../log4j/audit/rest/RequestContextFilter.java | 21 ++++++++++++-------
.../rest/RequestContextHandlerInterceptor.java | 22 ++++++++++++--------
2 files changed, 26 insertions(+), 17 deletions(-)
----------------------------------------------------------------------