aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorZach Smith <zach@driver.xyz>2017-11-01 09:24:16 -0700
committerZach Smith <zach@driver.xyz>2017-11-01 09:24:16 -0700
commit595d199f5e41c8e48131cec98b23452bc7ed6ef1 (patch)
treea444fbafefccf232e68e72b3f592cd3e0bca3396 /src/main
parent2c80cea86c0c322aad86303e5da5e2c382b20871 (diff)
downloaddriver-core-595d199f5e41c8e48131cec98b23452bc7ed6ef1.tar.gz
driver-core-595d199f5e41c8e48131cec98b23452bc7ed6ef1.tar.bz2
driver-core-595d199f5e41c8e48131cec98b23452bc7ed6ef1.zip
Add DriverRouteTest
Diffstat (limited to 'src/main')
-rw-r--r--src/main/scala/xyz/driver/core/rest/DriverRoute.scala3
-rw-r--r--src/main/scala/xyz/driver/core/rest/errors/serviceException.scala4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
index 9af6657..eb9a31a 100644
--- a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
+++ b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
@@ -82,6 +82,9 @@ trait DriverRoute {
case e: ResourceNotFoundException =>
log.info("Resource not found error", e)
StatusCodes.NotFound
+ case e: ExternalServiceException =>
+ log.error("Error while calling another service", e)
+ StatusCodes.InternalServerError
case e: ExternalServiceTimeoutException =>
log.error("Service timeout error", e)
StatusCodes.GatewayTimeout
diff --git a/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala b/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
index ca1f759..e91a3c2 100644
--- a/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
+++ b/src/main/scala/xyz/driver/core/rest/errors/serviceException.scala
@@ -1,6 +1,6 @@
package xyz.driver.core.rest.errors
-abstract class ServiceException extends Exception {
+sealed abstract class ServiceException extends Exception {
def message: String
}
@@ -13,7 +13,7 @@ final case class ResourceNotFoundException(override val message: String = "Resou
extends ServiceException
final case class ExternalServiceException(serviceName: String, serviceMessage: String) extends ServiceException {
- override def message = s"Error while calling another service: $serviceMessage"
+ override def message = s"Error while calling '$serviceName': $serviceMessage"
}
final case class ExternalServiceTimeoutException(serviceName: String) extends ServiceException {