From 066417ab2ca1cc2a8aab76c182115573ec7f5405 Mon Sep 17 00:00:00 2001
From: Zach Smith <zach@driver.xyz>
Date: Mon, 1 May 2017 17:37:45 -0700
Subject: Bump sbt-settings and fix errors

---
 src/main/scala/xyz/driver/core/app.scala | 56 +++++++++++++++++---------------
 1 file changed, 30 insertions(+), 26 deletions(-)

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

diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala
index 9fab320..f7731e3 100644
--- a/src/main/scala/xyz/driver/core/app.scala
+++ b/src/main/scala/xyz/driver/core/app.scala
@@ -66,33 +66,37 @@ object app {
       val versionRt      = versionRoute(version, gitHash, time.currentTime())
 
       val _ = Future {
-        http.bindAndHandle(route2HandlerFlow(extractHost { origin =>
-          extractClientIP {
-            ip =>
-              { ctx =>
-                val trackingId = rest.extractTrackingId(ctx.request)
-                MDC.put("trackingId", trackingId)
-                MDC.put("origin", origin)
-                MDC.put("ip", ip.toOption.map(_.getHostAddress).getOrElse("unknown"))
-
-                def requestLogging: Future[Unit] = Future {
-                  log.info(
-                    s"""Received request {"method":"${ctx.request.method.value}","url": "${ctx.request.uri}"}""")
-                }
+        http.bindAndHandle(
+          route2HandlerFlow(extractHost { origin =>
+            extractClientIP {
+              ip =>
+                { ctx =>
+                  val trackingId = rest.extractTrackingId(ctx.request)
+                  MDC.put("trackingId", trackingId)
+                  MDC.put("origin", origin)
+                  MDC.put("ip", ip.toOption.map(_.getHostAddress).getOrElse("unknown"))
+
+                  def requestLogging: Future[Unit] = Future {
+                    log.info(
+                      s"""Received request {"method":"${ctx.request.method.value}","url": "${ctx.request.uri}"}""")
+                  }
 
-                val contextWithTrackingId =
-                  ctx.withRequest(ctx.request.addHeader(RawHeader(ContextHeaders.TrackingIdHeader, trackingId)))
+                  val contextWithTrackingId =
+                    ctx.withRequest(ctx.request.addHeader(RawHeader(ContextHeaders.TrackingIdHeader, trackingId)))
 
-                handleExceptions(ExceptionHandler(exceptionHandler))({ c =>
-                  requestLogging.flatMap { _ =>
-                    respondWithHeaders(List(RawHeader(ContextHeaders.TrackingIdHeader, trackingId))) {
-                      modules.map(_.route).foldLeft(versionRt ~ healthRoute ~ swaggerRoutes)(_ ~ _)
-                    }(c)
-                  }
-                })(contextWithTrackingId)
-              }
-          }
-        }), interface, port)(materializer)
+                  handleExceptions(ExceptionHandler(exceptionHandler))({ c =>
+                    requestLogging.flatMap { _ =>
+                      respondWithHeaders(List(RawHeader(ContextHeaders.TrackingIdHeader, trackingId))) {
+                        modules.map(_.route).foldLeft(versionRt ~ healthRoute ~ swaggerRoutes)(_ ~ _)
+                      }(c)
+                    }
+                  })(contextWithTrackingId)
+                }
+            }
+          }),
+          interface,
+          port
+        )(materializer)
       }
     }
 
@@ -249,7 +253,7 @@ object app {
     */
   class CompositeModule(val name: String, modules: Seq[Module]) extends Module with RouteConcatenation {
 
-    def route: Route = modules.map(_.route).reduce(_ ~ _)
+    def route: Route = RouteConcatenation.concat(modules.map(_.route): _*)
     def routeTypes   = modules.flatMap(_.routeTypes)
 
     override def activate()   = modules.foreach(_.activate())
-- 
cgit v1.2.3