aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/xyz/driver/core/app.scala
diff options
context:
space:
mode:
authorvlad <vlad@driver.xyz>2017-02-28 11:19:03 -0800
committervlad <vlad@driver.xyz>2017-02-28 11:19:03 -0800
commit43c29ea035c5d50789d42e55482d49640db4aa75 (patch)
tree8ead2eed99d212a8cddca845110784247b194bc7 /src/main/scala/xyz/driver/core/app.scala
parent93349b72cff2946ba449faf122f234e3c330ce11 (diff)
downloaddriver-core-43c29ea035c5d50789d42e55482d49640db4aa75.tar.gz
driver-core-43c29ea035c5d50789d42e55482d49640db4aa75.tar.bz2
driver-core-43c29ea035c5d50789d42e55482d49640db4aa75.zip
Need less data to extract ServiceRequestContextv0.10.16
Diffstat (limited to 'src/main/scala/xyz/driver/core/app.scala')
-rw-r--r--src/main/scala/xyz/driver/core/app.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala
index 68c7cf0..deb0e6a 100644
--- a/src/main/scala/xyz/driver/core/app.scala
+++ b/src/main/scala/xyz/driver/core/app.scala
@@ -71,7 +71,7 @@ object app {
val _ = Future {
http.bindAndHandle(route2HandlerFlow(handleExceptions(ExceptionHandler(exceptionHandler)) { ctx =>
- val trackingId = rest.extractTrackingId(ctx)
+ val trackingId = rest.extractTrackingId(ctx.request)
log.audit(s"Received request ${ctx.request} with tracking id $trackingId")
val contextWithTrackingId =
@@ -93,26 +93,26 @@ object app {
case is: IllegalStateException =>
ctx =>
- val trackingId = rest.extractTrackingId(ctx)
+ val trackingId = rest.extractTrackingId(ctx.request)
log.debug(s"Request is not allowed to ${ctx.request.uri} ($trackingId)", is)
complete(HttpResponse(BadRequest, entity = is.getMessage))(ctx)
case cm: ConcurrentModificationException =>
ctx =>
- val trackingId = rest.extractTrackingId(ctx)
+ val trackingId = rest.extractTrackingId(ctx.request)
log.audit(s"Concurrent modification of the resource ${ctx.request.uri} ($trackingId)", cm)
complete(
HttpResponse(Conflict, entity = "Resource was changed concurrently, try requesting a newer version"))(ctx)
case sex: SQLException =>
ctx =>
- val trackingId = rest.extractTrackingId(ctx)
+ val trackingId = rest.extractTrackingId(ctx.request)
log.audit(s"Database exception for the resource ${ctx.request.uri} ($trackingId)", sex)
complete(HttpResponse(InternalServerError, entity = "Data access error"))(ctx)
case t: Throwable =>
ctx =>
- val trackingId = rest.extractTrackingId(ctx)
+ val trackingId = rest.extractTrackingId(ctx.request)
log.error(s"Request to ${ctx.request.uri} could not be handled normally ($trackingId)", t)
complete(HttpResponse(InternalServerError, entity = t.getMessage))(ctx)
}