diff options
author | vlad <vlad@driver.xyz> | 2017-03-13 23:30:06 -0700 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-03-13 23:30:06 -0700 |
commit | 1b2d2b39e18073ba83f59d1572269140ae9f4945 (patch) | |
tree | 0757c75ee5e32df9c1a9297e3160777af7a63b61 /src/main/scala/xyz/driver/core | |
parent | 0ee83a407c6313d0bb1a6d62233fea1f831f0a18 (diff) | |
download | driver-core-1b2d2b39e18073ba83f59d1572269140ae9f4945.tar.gz driver-core-1b2d2b39e18073ba83f59d1572269140ae9f4945.tar.bz2 driver-core-1b2d2b39e18073ba83f59d1572269140ae9f4945.zip |
Added writing tracking Id to MDC so it can be logged for all messages, removed some linkerd legacy and refined Revision equals
Diffstat (limited to 'src/main/scala/xyz/driver/core')
-rw-r--r-- | src/main/scala/xyz/driver/core/app.scala | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala index ab889dc..8edb427 100644 --- a/src/main/scala/xyz/driver/core/app.scala +++ b/src/main/scala/xyz/driver/core/app.scala @@ -93,26 +93,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) + log.error(s"Request is not allowed to ${ctx.request.uri} ($trackingId)", 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) + 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 => val trackingId = Option(MDC.get("trackingId")).getOrElse(rest.extractTrackingId(ctx.request)) - log.audit(s"Database exception for the resource ${ctx.request.uri}", sex) + 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 => 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) + log.error(s"Request to ${ctx.request.uri} could not be handled normally ($trackingId)", t) complete(HttpResponse(InternalServerError, entity = t.getMessage))(ctx) } |