Skip to content

Commit

Permalink
Add withModifiedContext to SelfAwareStructuredLogger
Browse files Browse the repository at this point in the history
  • Loading branch information
@ivan-klass
ivan-klass committed Feb 12, 2021
1 parent 6e90daf commit 35ef8b9
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 38 deletions.
48 changes: 24 additions & 24 deletions core/shared/src/main/scala/org/typelevel/log4cats/SelfAwareStructuredLogger.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,27 @@ object SelfAwareStructuredLogger {
def withContext[F[_]](
sl: SelfAwareStructuredLogger[F]
)(ctx: Map[String, String]): SelfAwareStructuredLogger[F] =
new ExtraContextSelfAwareStructuredLogger[F](sl)(ctx)
new ModifiedContextSelfAwareStructuredLogger[F](sl)(ctx ++ _)

private class ExtraContextSelfAwareStructuredLogger[F[_]](sl: SelfAwareStructuredLogger[F])(
ctx: Map[String, String]
private class ModifiedContextSelfAwareStructuredLogger[F[_]](sl: SelfAwareStructuredLogger[F])(
modify: Map[String, String] => Map[String, String]
) extends SelfAwareStructuredLogger[F] {
private val outer = ctx
def error(message: => String): F[Unit] = sl.error(outer)(message)
def warn(message: => String): F[Unit] = sl.warn(outer)(message)
def info(message: => String): F[Unit] = sl.info(outer)(message)
def debug(message: => String): F[Unit] = sl.debug(outer)(message)
def trace(message: => String): F[Unit] = sl.trace(outer)(message)
private lazy val defaultCtx: Map[String, String] = modify(Map.empty)
def error(message: => String): F[Unit] = sl.error(defaultCtx)(message)
def warn(message: => String): F[Unit] = sl.warn(defaultCtx)(message)
def info(message: => String): F[Unit] = sl.info(defaultCtx)(message)
def debug(message: => String): F[Unit] = sl.debug(defaultCtx)(message)
def trace(message: => String): F[Unit] = sl.trace(defaultCtx)(message)
def trace(ctx: Map[String, String])(msg: => String): F[Unit] =
sl.trace(outer ++ ctx)(msg)
sl.trace(modify(ctx))(msg)
def debug(ctx: Map[String, String])(msg: => String): F[Unit] =
sl.debug(outer ++ ctx)(msg)
sl.debug(modify(ctx))(msg)
def info(ctx: Map[String, String])(msg: => String): F[Unit] =
sl.info(outer ++ ctx)(msg)
sl.info(modify(ctx))(msg)
def warn(ctx: Map[String, String])(msg: => String): F[Unit] =
sl.warn(outer ++ ctx)(msg)
sl.warn(modify(ctx))(msg)
def error(ctx: Map[String, String])(msg: => String): F[Unit] =
sl.error(outer ++ ctx)(msg)
sl.error(modify(ctx))(msg)

def isTraceEnabled: F[Boolean] = sl.isTraceEnabled
def isDebugEnabled: F[Boolean] = sl.isDebugEnabled
Expand All @@ -58,26 +58,26 @@ object SelfAwareStructuredLogger {
def isErrorEnabled: F[Boolean] = sl.isErrorEnabled

def error(t: Throwable)(message: => String): F[Unit] =
sl.error(outer, t)(message)
sl.error(defaultCtx, t)(message)
def warn(t: Throwable)(message: => String): F[Unit] =
sl.warn(outer, t)(message)
sl.warn(defaultCtx, t)(message)
def info(t: Throwable)(message: => String): F[Unit] =
sl.info(outer, t)(message)
sl.info(defaultCtx, t)(message)
def debug(t: Throwable)(message: => String): F[Unit] =
sl.debug(outer, t)(message)
sl.debug(defaultCtx, t)(message)
def trace(t: Throwable)(message: => String): F[Unit] =
sl.trace(outer, t)(message)
sl.trace(defaultCtx, t)(message)

def error(ctx: Map[String, String], t: Throwable)(message: => String): F[Unit] =
sl.error(outer ++ ctx, t)(message)
sl.error(modify(ctx), t)(message)
def warn(ctx: Map[String, String], t: Throwable)(message: => String): F[Unit] =
sl.warn(outer ++ ctx, t)(message)
sl.warn(modify(ctx), t)(message)
def info(ctx: Map[String, String], t: Throwable)(message: => String): F[Unit] =
sl.info(outer ++ ctx, t)(message)
sl.info(modify(ctx), t)(message)
def debug(ctx: Map[String, String], t: Throwable)(message: => String): F[Unit] =
sl.debug(outer ++ ctx, t)(message)
sl.debug(modify(ctx), t)(message)
def trace(ctx: Map[String, String], t: Throwable)(message: => String): F[Unit] =
sl.trace(outer ++ ctx, t)(message)
sl.trace(modify(ctx), t)(message)
}

private def mapK[G[_], F[_]](
Expand Down
28 changes: 14 additions & 14 deletions core/shared/src/main/scala/org/typelevel/log4cats/StructuredLogger.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@ object StructuredLogger {
def apply[F[_]](implicit ev: StructuredLogger[F]): StructuredLogger[F] = ev

def withContext[F[_]](sl: StructuredLogger[F])(ctx: Map[String, String]): StructuredLogger[F] =
new ModifiedContextStructuredLogger[F](sl)(_ ++ ctx)
new ModifiedContextStructuredLogger[F](sl)(ctx ++ _)

def withModifiedContext[F[_]](
sl: StructuredLogger[F]
)(modifyCtx: Endo[Map[String, String]]): StructuredLogger[F] =
)(modifyCtx: Map[String, String] => Map[String, String]): StructuredLogger[F] =
new ModifiedContextStructuredLogger[F](sl)(modifyCtx)

private class ModifiedContextStructuredLogger[F[_]](sl: StructuredLogger[F])(
modify: Endo[Map[String, String]]
modify: Map[String, String] => Map[String, String]
) extends StructuredLogger[F] {
private def whenEmpty: Map[String, String] = modify(Map.empty)
def error(message: => String): F[Unit] = sl.error(whenEmpty)(message)
def warn(message: => String): F[Unit] = sl.warn(whenEmpty)(message)
def info(message: => String): F[Unit] = sl.info(whenEmpty)(message)
def debug(message: => String): F[Unit] = sl.debug(whenEmpty)(message)
def trace(message: => String): F[Unit] = sl.trace(whenEmpty)(message)
private lazy val defaultCtx: Map[String, String] = modify(Map.empty)
def error(message: => String): F[Unit] = sl.error(defaultCtx)(message)
def warn(message: => String): F[Unit] = sl.warn(defaultCtx)(message)
def info(message: => String): F[Unit] = sl.info(defaultCtx)(message)
def debug(message: => String): F[Unit] = sl.debug(defaultCtx)(message)
def trace(message: => String): F[Unit] = sl.trace(defaultCtx)(message)
def trace(ctx: Map[String, String])(msg: => String): F[Unit] =
sl.trace(modify(ctx))(msg)
def debug(ctx: Map[String, String])(msg: => String): F[Unit] =
Expand All @@ -65,15 +65,15 @@ object StructuredLogger {
sl.error(modify(ctx))(msg)

def error(t: Throwable)(message: => String): F[Unit] =
sl.error(whenEmpty, t)(message)
sl.error(defaultCtx, t)(message)
def warn(t: Throwable)(message: => String): F[Unit] =
sl.warn(whenEmpty, t)(message)
sl.warn(defaultCtx, t)(message)
def info(t: Throwable)(message: => String): F[Unit] =
sl.info(whenEmpty, t)(message)
sl.info(defaultCtx, t)(message)
def debug(t: Throwable)(message: => String): F[Unit] =
sl.debug(whenEmpty, t)(message)
sl.debug(defaultCtx, t)(message)
def trace(t: Throwable)(message: => String): F[Unit] =
sl.trace(whenEmpty, t)(message)
sl.trace(defaultCtx, t)(message)

def error(ctx: Map[String, String], t: Throwable)(message: => String): F[Unit] =
sl.error(modify(ctx), t)(message)
Expand Down

0 comments on commit 35ef8b9

Please sign in to comment.