aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
diff options
context:
space:
mode:
authorJakob Odersky <jakob@driver.xyz>2017-11-19 23:29:03 -0800
committerJakob Odersky <jakob@driver.xyz>2017-11-20 00:07:42 -0800
commitb872ee2649c7b56df413fbde746ee68312c17abd (patch)
tree34b5fc63cc425a27969c73354fd7a2071ea67ba3 /src/main/scala/xyz/driver/core/rest/DriverRoute.scala
parent871e25f5e5ba23ca9202009d49fb38386558edd9 (diff)
downloaddriver-core-b872ee2649c7b56df413fbde746ee68312c17abd.tar.gz
driver-core-b872ee2649c7b56df413fbde746ee68312c17abd.tar.bz2
driver-core-b872ee2649c7b56df413fbde746ee68312c17abd.zip
Apply new formatting
Diffstat (limited to 'src/main/scala/xyz/driver/core/rest/DriverRoute.scala')
-rw-r--r--src/main/scala/xyz/driver/core/rest/DriverRoute.scala18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
index eb9a31a..4c483c6 100644
--- a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
+++ b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
@@ -55,10 +55,11 @@ trait DriverRoute {
case cm: ConcurrentModificationException =>
ctx =>
log.warn(s"Concurrent modification of the resource ${ctx.request.method} ${ctx.request.uri}", cm)
- errorResponse(ctx,
- StatusCodes.Conflict,
- "Resource was changed concurrently, try requesting a newer version",
- cm)(ctx)
+ errorResponse(
+ ctx,
+ StatusCodes.Conflict,
+ "Resource was changed concurrently, try requesting a newer version",
+ cm)(ctx)
case se: SQLException =>
ctx =>
@@ -98,10 +99,11 @@ trait DriverRoute {
}
}
- protected def errorResponse[T <: Exception](ctx: RequestContext,
- statusCode: StatusCode,
- message: String,
- exception: T): Route = {
+ protected def errorResponse[T <: Exception](
+ ctx: RequestContext,
+ statusCode: StatusCode,
+ message: String,
+ exception: T): Route = {
val trackingId = rest.extractTrackingId(ctx.request)
MDC.put("trackingId", trackingId)
complete(HttpResponse(statusCode, entity = message))