Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions app/org/maproulette/filters/HttpLoggingFilter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.maproulette.filters

import javax.inject.Inject
import akka.stream.Materializer
import org.slf4j.{LoggerFactory, MarkerFactory}
import org.slf4j.LoggerFactory
import play.api.mvc.Result
import play.api.mvc.RequestHeader
import play.api.mvc.Filter
Expand All @@ -25,9 +25,7 @@ class HttpLoggingFilter @Inject() (
nextFilter: RequestHeader => Future[Result]
)(requestHeader: RequestHeader): Future[Result] = {
val startTime = System.currentTimeMillis
// Create a uuid and associate it with a Marker
val uuid = java.util.UUID.randomUUID.toString
val marker = MarkerFactory.getMarker(uuid)
val uuid = java.util.UUID.randomUUID.toString

nextFilter(requestHeader).map { result =>
val endTime = System.currentTimeMillis
Expand All @@ -39,8 +37,8 @@ class HttpLoggingFilter @Inject() (
}

accessLogger.info(
marker,
"Request '{}' [{}] {}ms - Response {}",
"Request {} '{}' [{}] {}ms - Response {}",
uuid,
requestHeader.toString(),
action,
requestTotalTime,
Expand All @@ -49,9 +47,8 @@ class HttpLoggingFilter @Inject() (

if (logger.isTraceEnabled()) {
logger.trace(
marker,
"id={} Request Headers: {}",
requestHeader.id,
"Request {} Headers: {}",
uuid,
requestHeader.headers.headers
.map({ case (k, v) => s"${k}=${v}" })
.mkString(" ;; ")
Expand Down