diff options
author | vlad <vlad@driver.xyz> | 2017-02-02 20:57:14 -0500 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-02-02 20:57:14 -0500 |
commit | e1ace181e97506130810eb1e1e19c720bf4d490c (patch) | |
tree | 116e299da28ac1aa7d6ab1d9768fcbf7f873101a /src/main/scala/xyz/driver/core/app.scala | |
parent | 61119c2f1a1b9926410f18ae00714be6f9a225d5 (diff) | |
download | driver-core-e1ace181e97506130810eb1e1e19c720bf4d490c.tar.gz driver-core-e1ace181e97506130810eb1e1e19c720bf4d490c.tar.bz2 driver-core-e1ace181e97506130810eb1e1e19c720bf4d490c.zip |
Made rest directives change less disruptivev0.10.3
Diffstat (limited to 'src/main/scala/xyz/driver/core/app.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/app.scala | 10 |
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 54d08d4..5482b3b 100644 --- a/src/main/scala/xyz/driver/core/app.scala +++ b/src/main/scala/xyz/driver/core/app.scala @@ -16,7 +16,7 @@ import org.slf4j.LoggerFactory import spray.json.DefaultJsonProtocol import xyz.driver.core import xyz.driver.core.logging.{Logger, TypesafeScalaLogger} -import xyz.driver.core.rest.ServiceRequestContext.ContextHeaders +import xyz.driver.core.rest.ContextHeaders import xyz.driver.core.rest.Swagger import xyz.driver.core.stats.SystemStats import xyz.driver.core.time.Time @@ -69,7 +69,7 @@ object app { val _ = Future { http.bindAndHandle(route2HandlerFlow(handleExceptions(ExceptionHandler(exceptionHandler)) { ctx => - val trackingId = rest.ServiceRequestContext.extractTrackingId(ctx) + val trackingId = rest.extractTrackingId(ctx) log.audit(s"Received request ${ctx.request} with tracking id $trackingId") val contextWithTrackingId = @@ -91,20 +91,20 @@ object app { case is: IllegalStateException => ctx => - val trackingId = rest.ServiceRequestContext.extractTrackingId(ctx) + val trackingId = rest.extractTrackingId(ctx) 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.ServiceRequestContext.extractTrackingId(ctx) + val trackingId = rest.extractTrackingId(ctx) 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 t: Throwable => ctx => - val trackingId = rest.ServiceRequestContext.extractTrackingId(ctx) + val trackingId = rest.extractTrackingId(ctx) log.error(s"Request to ${ctx.request.uri} could not be handled normally ($trackingId)", t) complete(HttpResponse(InternalServerError, entity = t.getMessage))(ctx) } |