Merge pull request #357 from lichess-org/refactor-middleware

Code golf middleware
lichess-org · Nov 1, 2024 · 4726d8a · 4726d8a
2 parents fc301b4 + 44d8a24
commit 4726d8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/modules/app/src/main/scala/http.middleware.scala b/modules/app/src/main/scala/http.middleware.scala
@@ -4,26 +4,18 @@ package app
 import cats.effect.IO
 import org.http4s.*
 import org.http4s.server.middleware.*
-import org.typelevel.log4cats.{ Logger, LoggerFactory }
+import org.typelevel.log4cats.LoggerFactory
 
 import scala.concurrent.duration.*
 
 type Middleware = HttpRoutes[IO] => HttpRoutes[IO]
-def ApplyMiddleware(config: HttpServerConfig)(routes: HttpRoutes[IO])(using
-    LoggerFactory[IO]
-): HttpRoutes[IO] =
-
-  val autoSlash: Middleware = AutoSlash(_)
-  val timeout: Middleware   = Timeout(60.seconds)
-
-  val middleware = autoSlash.andThen(timeout)
+def MkMiddleware(config: HttpServerConfig)(using LoggerFactory[IO]): Middleware =
 
   def verboseLogger =
     RequestLogger.httpRoutes[IO](true, true).andThen(ResponseLogger.httpRoutes[IO, Request[IO]](true, true))
 
-  given Logger[IO] = LoggerFactory[IO].getLogger
   val logger =
     if config.apiLogger then verboseLogger
-    else ApiErrorLogger.instance
+    else ApiErrorLogger.instance(using LoggerFactory[IO].getLogger)
 
-  logger(middleware(routes))
+  logger.andThen(AutoSlash(_)).andThen(Timeout(60.seconds))
diff --git a/modules/app/src/main/scala/http.routes.scala b/modules/app/src/main/scala/http.routes.scala
@@ -35,4 +35,4 @@ def Routes(resources: AppResources, config: HttpServerConfig)(using
     if config.enableDocs then apiRoutes.map(_ <+> docs)
     else apiRoutes
 
-  allRoutes.map(ApplyMiddleware(config))
+  allRoutes.map(MkMiddleware(config))