From 8a21ee2028b5f11fe0b9148078b49e4000937202 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@driver.xyz>
Date: Tue, 11 Sep 2018 13:35:03 -0700
Subject: Rearchitect reporting stack to mixin-based structure

---
 src/main/scala/xyz/driver/core/app/DriverApp.scala | 3 +--
 src/main/scala/xyz/driver/core/app/init.scala      | 9 ++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/main/scala/xyz/driver/core/app')

diff --git a/src/main/scala/xyz/driver/core/app/DriverApp.scala b/src/main/scala/xyz/driver/core/app/DriverApp.scala
index 50e471c..03da72b 100644
--- a/src/main/scala/xyz/driver/core/app/DriverApp.scala
+++ b/src/main/scala/xyz/driver/core/app/DriverApp.scala
@@ -91,8 +91,7 @@ class DriverApp(
       def route: Route = versionRt ~ healthRoute
     }
     val combinedRoute =
-      Route.seal(
-        modules.map(_.route).foldLeft(basicRoutes.routeWithDefaults)(_ ~ _) ~ swaggerRoute.route ~ defaultOptionsRoute)
+      Route.seal(modules.map(_.route).foldLeft(basicRoutes.routeWithDefaults)(_ ~ _) ~ swaggerRoute.route)
     (extractHost & extractClientIP & trace(tracer) & handleRejections(authenticationRejectionHandler)) {
       case (origin, ip) =>
         ctx =>
diff --git a/src/main/scala/xyz/driver/core/app/init.scala b/src/main/scala/xyz/driver/core/app/init.scala
index 767fd0b..bb7a798 100644
--- a/src/main/scala/xyz/driver/core/app/init.scala
+++ b/src/main/scala/xyz/driver/core/app/init.scala
@@ -10,7 +10,7 @@ import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.Logger
 import org.slf4j.LoggerFactory
 import xyz.driver.core.logging.MdcExecutionContext
-import xyz.driver.core.reporting.{NoTraceReporter, ScalaLoggerLike}
+import xyz.driver.core.reporting.{ScalaLoggingCompat, NoTraceReporter}
 import xyz.driver.core.time.provider.TimeProvider
 import xyz.driver.tracing.{GoogleTracer, NoTracer, Tracer}
 
@@ -26,7 +26,7 @@ object init {
     val gitHeadCommit: scala.Option[String]
   }
 
-  case class ApplicationContext(config: Config, clock: Clock, reporter: ScalaLoggerLike) {
+  case class ApplicationContext(config: Config, clock: Clock, reporter: ScalaLoggingCompat) {
     val time: TimeProvider = clock
   }
 
@@ -90,7 +90,10 @@ object init {
     ApplicationContext(
       config = getEnvironmentSpecificConfig(),
       clock = Clock.systemUTC(),
-      new NoTraceReporter(Logger(LoggerFactory.getLogger(classOf[DriverApp]))))
+      new NoTraceReporter with ScalaLoggingCompat {
+        val logger = Logger(LoggerFactory.getLogger(classOf[DriverApp]))
+      }
+    )
 
   def createDefaultApplication(
       modules: Seq[Module],
-- 
cgit v1.2.3