From 43c29ea035c5d50789d42e55482d49640db4aa75 Mon Sep 17 00:00:00 2001
From: vlad <vlad@driver.xyz>
Date: Tue, 28 Feb 2017 11:19:03 -0800
Subject: Need less data to extract ServiceRequestContext

---
 src/main/scala/xyz/driver/core/app.scala | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/main/scala/xyz/driver/core/app.scala')

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)
     }
-- 
cgit v1.2.3