aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2018-03-26 01:21:45 -0700
committervlad <vlad@driver.xyz>2018-03-26 01:21:45 -0700
commit530f781a3d1a30dd381e16e8ee67becad2f17f07 (patch)
tree666e2372ae42f42486d63b01f4e7fdb735210c3d
parentd61f8a1e7053c5f5003f916e68c24ccc116485ca (diff)
downloaddriver-core-530f781a3d1a30dd381e16e8ee67becad2f17f07.tar.gz
driver-core-530f781a3d1a30dd381e16e8ee67becad2f17f07.tar.bz2
driver-core-530f781a3d1a30dd381e16e8ee67becad2f17f07.zip
Correct `trackingId` placement to the MDC
-rw-r--r--src/main/scala/xyz/driver/core/rest/DriverRoute.scala14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
index 8878ef4..c23c44d 100644
--- a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
+++ b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
@@ -26,10 +26,9 @@ trait DriverRoute {
protected def defaultResponseHeaders: Directive0 = {
extractRequest flatMap { request =>
-
// Needs to happen before any request processing, so all the log messages
// associated with processing of this request are having this `trackingId`
- val trackingId = rest.extractTrackingId(request)
+ val trackingId = rest.extractTrackingId(request)
val tracingHeader = RawHeader(ContextHeaders.TrackingIdHeader, trackingId)
MDC.put("trackingId", trackingId)
@@ -54,10 +53,8 @@ trait DriverRoute {
case cm: ConcurrentModificationException =>
ctx =>
log.warn(s"Concurrent modification of the resource ${ctx.request.method} ${ctx.request.uri}", cm)
- errorResponse(
- StatusCodes.Conflict,
- "Resource was changed concurrently, try requesting a newer version",
- cm)(ctx)
+ errorResponse(StatusCodes.Conflict, "Resource was changed concurrently, try requesting a newer version", cm)(
+ ctx)
case se: SQLException =>
ctx =>
@@ -97,10 +94,7 @@ trait DriverRoute {
}
}
- protected def errorResponse[T <: Exception](
- statusCode: StatusCode,
- message: String,
- exception: T): Route = {
+ protected def errorResponse[T <: Exception](statusCode: StatusCode, message: String, exception: T): Route = {
complete(HttpResponse(statusCode, entity = message))
}
}