-
Notifications
You must be signed in to change notification settings - Fork 413
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove log4s usage in http4s-server integration (#3663)
Co-authored-by: Henry Genet <[email protected]>
- Loading branch information
Showing
2 changed files
with
13 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 10 additions & 9 deletions
19
server/http4s-server/src/main/scalajvm/sttp/tapir/server/http4s/Http4sDefaultServerLog.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,26 @@ | ||
package sttp.tapir.server.http4s | ||
|
||
import cats.effect.Sync | ||
import org.typelevel.log4cats.Logger | ||
import org.typelevel.log4cats.slf4j.Slf4jLogger | ||
import sttp.tapir.server.interceptor.log.DefaultServerLog | ||
import org.log4s.{Logger, getLogger} | ||
|
||
object Http4sDefaultServerLog { | ||
private[http4s] val log: Logger = getLogger | ||
|
||
def apply[F[_]: Sync]: DefaultServerLog[F] = { | ||
val log = Slf4jLogger.getLogger[F] | ||
DefaultServerLog( | ||
doLogWhenReceived = debugLog(_, None), | ||
doLogWhenHandled = debugLog[F], | ||
doLogAllDecodeFailures = debugLog[F], | ||
doLogExceptions = (msg: String, ex: Throwable) => Sync[F].delay(log.error(ex)(msg)), | ||
doLogWhenReceived = msg => debugLog(log)(msg, None), | ||
doLogWhenHandled = debugLog(log), | ||
doLogAllDecodeFailures = debugLog(log), | ||
doLogExceptions = (msg: String, ex: Throwable) => log.error(ex)(msg), | ||
noLog = Sync[F].pure(()) | ||
) | ||
} | ||
|
||
private def debugLog[F[_]](msg: String, exOpt: Option[Throwable])(implicit sync: Sync[F]): F[Unit] = | ||
private def debugLog[F[_]](log: Logger[F])(msg: String, exOpt: Option[Throwable]): F[Unit] = | ||
exOpt match { | ||
case None => Sync[F].delay(log.debug(msg)) | ||
case Some(ex) => Sync[F].delay(log.debug(ex)(msg)) | ||
case None => log.debug(msg) | ||
case Some(ex) => log.debug(ex)(msg) | ||
} | ||
} |