aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-03-20 18:55:49 -0700
committervlad <vlad@driver.xyz>2017-03-20 18:55:49 -0700
commit7f03501bf652214a4a8d12f62764f73257714d7e (patch)
tree70356a4e0a537ddff2e1a21c96c359e4fd8b5561
parent6ae573387e623912a164d3e35e2c79065434d978 (diff)
downloaddriver-core-7f03501bf652214a4a8d12f62764f73257714d7e.tar.gz
driver-core-7f03501bf652214a4a8d12f62764f73257714d7e.tar.bz2
driver-core-7f03501bf652214a4a8d12f62764f73257714d7e.zip
Rolling back entity logging to fix PDW-284
-rw-r--r--src/main/scala/xyz/driver/core/app.scala17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala
index fe45c62..4966b9d 100644
--- a/src/main/scala/xyz/driver/core/app.scala
+++ b/src/main/scala/xyz/driver/core/app.scala
@@ -11,8 +11,7 @@ import akka.http.scaladsl.model.headers.RawHeader
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server.RouteResult._
import akka.http.scaladsl.server.{ExceptionHandler, Route, RouteConcatenation}
-import akka.stream.scaladsl.Sink
-import akka.stream.{ActorMaterializer, Materializer}
+import akka.stream.ActorMaterializer
import com.typesafe.config.Config
import io.swagger.models.Scheme
import org.slf4j.{LoggerFactory, MDC}
@@ -67,23 +66,13 @@ object app {
val swaggerRoutes = swaggerService.routes ~ swaggerService.swaggerUI
val versionRt = versionRoute(version, gitHash, time.currentTime())
- def entityAsString(entity: HttpEntity)(implicit m: Materializer, ex: ExecutionContext): Future[String] =
- entity.dataBytes
- .map(_.decodeString(entity.contentType.charsetOption.fold("UTF-8")(_.value)))
- .runWith(Sink.head)
-
val _ = Future {
http.bindAndHandle(route2HandlerFlow({ ctx =>
val trackingId = rest.extractTrackingId(ctx.request)
MDC.put("trackingId", trackingId)
- def requestLogging: Future[Unit] = {
- entityAsString(ctx.request.entity).map { data =>
- s"""{"method":"${ctx.request.method.value}","url": "${ctx.request.uri}","entity":"$data"}""".stripMargin
- } map { requestJson =>
- MDC.put("message", "Received request")
- log.audit(requestJson)
- }
+ def requestLogging: Future[Unit] = Future {
+ log.audit(s"""Received request {"method":"${ctx.request.method.value}","url": "${ctx.request.uri}"}""")
}
val contextWithTrackingId =