diff options
author | vlad <vlad@driver.xyz> | 2017-03-13 23:38:54 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-03-13 23:38:54 -0700 |
commit | bef521a16cfbc571cf9d5470735c2120454cfd18 (patch) | |
tree | 8cf8e13987ccfbd03f24f53c5b27879bdae9ab76 | |
parent | c71e402cee010d8cbc6e8119c8fb96367d085aa9 (diff) | |
download | driver-core-bef521a16cfbc571cf9d5470735c2120454cfd18.tar.gz driver-core-bef521a16cfbc571cf9d5470735c2120454cfd18.tar.bz2 driver-core-bef521a16cfbc571cf9d5470735c2120454cfd18.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 | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala index ceaf772..5a1b803 100644 --- a/src/main/scala/xyz/driver/core/app.scala +++ b/src/main/scala/xyz/driver/core/app.scala @@ -95,23 +95,27 @@ object app { case is: IllegalStateException => ctx => - log.error(s"Request is not allowed to ${ctx.request.uri}", is) + val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) + log.error(s"Request is not allowed to ${ctx.request.uri} ($trackingId)", is) complete(HttpResponse(BadRequest, entity = is.getMessage))(ctx) case cm: ConcurrentModificationException => ctx => - log.error(s"Concurrent modification of the resource ${ctx.request.uri}", cm) + val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) + log.error(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 => - log.error(s"Database exception for the resource ${ctx.request.uri}", sex) + val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) + log.error(s"Database exception for the resource ${ctx.request.uri} ($trackingId)", sex) complete(HttpResponse(InternalServerError, entity = "Data access error"))(ctx) case t: Throwable => ctx => - log.error(s"Request to ${ctx.request.uri} could not be handled normally", t) + val trackingId = Option(MDC.get("trackingId")).getOrElse(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) } |