From dbae4615dc693b826bf4d8605c58161cadf62e51 Mon Sep 17 00:00:00 2001 From: vstepanov Date: Mon, 4 Mar 2019 13:42:03 +0100 Subject: [PATCH] ARUHA-2199: fixed status code 102 reporting; check for null; --- .../java/org/zalando/nakadi/filters/LoggingFilter.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/zalando/nakadi/filters/LoggingFilter.java b/src/main/java/org/zalando/nakadi/filters/LoggingFilter.java index 4ec8bcec0d..77b0c732bd 100644 --- a/src/main/java/org/zalando/nakadi/filters/LoggingFilter.java +++ b/src/main/java/org/zalando/nakadi/filters/LoggingFilter.java @@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; import org.zalando.nakadi.plugin.api.authz.AuthorizationService; @@ -79,7 +80,7 @@ private AsyncRequestListener(final HttpServletRequest request, final HttpServlet this.flowId = flowId; this.requestLogInfo = new RequestLogInfo(request, startTime); - logToAccessLog(this.requestLogInfo, this.response.getStatus(), 0L); + logToAccessLog(this.requestLogInfo, HttpStatus.PROCESSING.value(), 0L); } private void logOnEvent() { @@ -163,8 +164,8 @@ private void logToAccessLog(final RequestLogInfo requestLogInfo, final int statu } private void traceRequest(final RequestLogInfo requestLogInfo, final int statusCode, final Long timeSpentMs) { - if ("POST".equals(requestLogInfo.method) && requestLogInfo.path.startsWith("/event-types/") && - requestLogInfo.path.contains("/events")) { + if (requestLogInfo.path != null && "POST".equals(requestLogInfo.method) && + requestLogInfo.path.startsWith("/event-types/") && requestLogInfo.path.contains("/events")) { final String eventType = requestLogInfo.path.substring("/event-types/".length(), requestLogInfo.path.lastIndexOf("/events"));