diff options
author | vlad <vlad@driver.xyz> | 2017-03-13 23:18:11 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-03-13 23:18:11 -0700 |
commit | 0ee83a407c6313d0bb1a6d62233fea1f831f0a18 (patch) | |
tree | 41873b93792aa43522db9ef5fb81f41e85d375e4 | |
parent | 9f7eeff5b4186632dcc1c37cec09dd4be2516d22 (diff) | |
download | driver-core-0ee83a407c6313d0bb1a6d62233fea1f831f0a18.tar.gz driver-core-0ee83a407c6313d0bb1a6d62233fea1f831f0a18.tar.bz2 driver-core-0ee83a407c6313d0bb1a6d62233fea1f831f0a18.zip |
Added writing tracking Id to MDC so it can be logged for all messages, removed some linkerd legacy and refined Revision equals
-rw-r--r-- | src/main/scala/xyz/driver/core/app.scala | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala index 1bcb358..ab889dc 100644 --- a/src/main/scala/xyz/driver/core/app.scala +++ b/src/main/scala/xyz/driver/core/app.scala @@ -92,22 +92,26 @@ object app { case is: IllegalStateException => ctx => + val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) log.debug(s"Request is not allowed to ${ctx.request.uri}", is) complete(HttpResponse(BadRequest, entity = is.getMessage))(ctx) case cm: ConcurrentModificationException => ctx => + val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) log.audit(s"Concurrent modification of the resource ${ctx.request.uri}", cm) complete( HttpResponse(Conflict, entity = "Resource was changed concurrently, try requesting a newer version"))(ctx) case sex: SQLException => ctx => + val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) log.audit(s"Database exception for the resource ${ctx.request.uri}", sex) complete(HttpResponse(InternalServerError, entity = "Data access error"))(ctx) case t: Throwable => ctx => + val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) log.error(s"Request to ${ctx.request.uri} could not be handled normally", t) complete(HttpResponse(InternalServerError, entity = t.getMessage))(ctx) } |