diff --git a/logging/structured/src/main/scala/tofu/logging/impl/ContextLoggingImpl.scala b/logging/structured/src/main/scala/tofu/logging/impl/ContextLoggingImpl.scala index a2dc532e5..ad4faf4bb 100644 --- a/logging/structured/src/main/scala/tofu/logging/impl/ContextLoggingImpl.scala +++ b/logging/structured/src/main/scala/tofu/logging/impl/ContextLoggingImpl.scala @@ -34,13 +34,13 @@ class ContextLoggingImpl[F[_]: Applicative, C: Loggable, Service: ClassTag](cont context.ask(ctx => logger.error(ContextMarker(ctx).addMarker(marker), message, values: _*)).whenA(errorEnabled) override def traceCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.ask(ctx => logger.trace(ContextMarker(ctx), message, values :+ cause: _*)).whenA(errorEnabled) + context.ask(ctx => logger.trace(ContextMarker(ctx), message, values :+ cause: _*)).whenA(traceEnabled) override def debugCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.ask(ctx => logger.debug(ContextMarker(ctx), message, values :+ cause: _*)).whenA(errorEnabled) + context.ask(ctx => logger.debug(ContextMarker(ctx), message, values :+ cause: _*)).whenA(debugEnabled) override def infoCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.ask(ctx => logger.info(ContextMarker(ctx), message, values :+ cause: _*)).whenA(errorEnabled) + context.ask(ctx => logger.info(ContextMarker(ctx), message, values :+ cause: _*)).whenA(infoEnabled) override def warnCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.ask(ctx => logger.error(ContextMarker(ctx), message, values :+ cause: _*)).whenA(errorEnabled) + context.ask(ctx => logger.error(ContextMarker(ctx), message, values :+ cause: _*)).whenA(warnEnabled) override def errorCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = context.ask(ctx => logger.error(ContextMarker(ctx), message, values :+ cause: _*)).whenA(errorEnabled) } diff --git a/logging/structured/src/main/scala/tofu/logging/impl/ContextSyncLoggingImpl.scala b/logging/structured/src/main/scala/tofu/logging/impl/ContextSyncLoggingImpl.scala index a48b9930a..04acd224f 100644 --- a/logging/structured/src/main/scala/tofu/logging/impl/ContextSyncLoggingImpl.scala +++ b/logging/structured/src/main/scala/tofu/logging/impl/ContextSyncLoggingImpl.scala @@ -42,13 +42,13 @@ class ContextSyncLoggingImpl[F[_], C: Loggable](context: F HasContext C, logger: .whenA(errorEnabled) override def traceCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.askF(ctx => F.delay(logger.trace(ContextMarker(ctx), message, values :+ cause: _*))).whenA(errorEnabled) + context.askF(ctx => F.delay(logger.trace(ContextMarker(ctx), message, values :+ cause: _*))).whenA(traceEnabled) override def debugCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.askF(ctx => F.delay(logger.debug(ContextMarker(ctx), message, values :+ cause: _*))).whenA(errorEnabled) + context.askF(ctx => F.delay(logger.debug(ContextMarker(ctx), message, values :+ cause: _*))).whenA(debugEnabled) override def infoCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.askF(ctx => F.delay(logger.info(ContextMarker(ctx), message, values :+ cause: _*))).whenA(errorEnabled) + context.askF(ctx => F.delay(logger.info(ContextMarker(ctx), message, values :+ cause: _*))).whenA(infoEnabled) override def warnCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - context.askF(ctx => F.delay(logger.warn(ContextMarker(ctx), message, values :+ cause: _*))).whenA(errorEnabled) + context.askF(ctx => F.delay(logger.warn(ContextMarker(ctx), message, values :+ cause: _*))).whenA(warnEnabled) override def errorCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = context.askF(ctx => F.delay(logger.error(ContextMarker(ctx), message, values :+ cause: _*))).whenA(errorEnabled) } diff --git a/logging/structured/src/main/scala/tofu/logging/impl/SyncLogging.scala b/logging/structured/src/main/scala/tofu/logging/impl/SyncLogging.scala index 384e000a8..e0d100d5f 100644 --- a/logging/structured/src/main/scala/tofu/logging/impl/SyncLogging.scala +++ b/logging/structured/src/main/scala/tofu/logging/impl/SyncLogging.scala @@ -20,11 +20,11 @@ class SyncLogging[F[_]](logger: Logger)(implicit F: Sync[F]) extends LoggingImpl override def errorCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = F.delay(logger.error(message, values :+ cause: _*)).whenA(errorEnabled) override def warnCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - F.delay(logger.warn(message, values :+ cause: _*)).whenA(errorEnabled) + F.delay(logger.warn(message, values :+ cause: _*)).whenA(warnEnabled) override def infoCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - F.delay(logger.info(message, values :+ cause: _*)).whenA(errorEnabled) + F.delay(logger.info(message, values :+ cause: _*)).whenA(infoEnabled) override def debugCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - F.delay(logger.debug(message, values :+ cause: _*)).whenA(errorEnabled) + F.delay(logger.debug(message, values :+ cause: _*)).whenA(debugEnabled) override def traceCause(message: String, cause: Throwable, values: LoggedValue*): F[Unit] = - F.delay(logger.trace(message, values :+ cause: _*)).whenA(errorEnabled) + F.delay(logger.trace(message, values :+ cause: _*)).whenA(traceEnabled) } diff --git a/zio/logging/src/main/scala/tofu/logging/impl/UIOZLogging.scala b/zio/logging/src/main/scala/tofu/logging/impl/UIOZLogging.scala index 4f8d15338..9387fbfb5 100644 --- a/zio/logging/src/main/scala/tofu/logging/impl/UIOZLogging.scala +++ b/zio/logging/src/main/scala/tofu/logging/impl/UIOZLogging.scala @@ -19,11 +19,11 @@ class UIOZLogging(logger: Logger) extends LoggingImpl[UIO](logger) { override def errorCause(message: String, cause: Throwable, values: LoggedValue*): UIO[Unit] = UIO.effectTotal(logger.error(message, values :+ cause: _*)).when(errorEnabled) override def warnCause(message: String, cause: Throwable, values: LoggedValue*): UIO[Unit] = - UIO.effectTotal(logger.warn(message, values :+ cause: _*)).when(errorEnabled) + UIO.effectTotal(logger.warn(message, values :+ cause: _*)).when(warnEnabled) override def infoCause(message: String, cause: Throwable, values: LoggedValue*): UIO[Unit] = - UIO.effectTotal(logger.info(message, values :+ cause: _*)).when(errorEnabled) + UIO.effectTotal(logger.info(message, values :+ cause: _*)).when(infoEnabled) override def debugCause(message: String, cause: Throwable, values: LoggedValue*): UIO[Unit] = - UIO.effectTotal(logger.debug(message, values :+ cause: _*)).when(errorEnabled) + UIO.effectTotal(logger.debug(message, values :+ cause: _*)).when(debugEnabled) override def traceCause(message: String, cause: Throwable, values: LoggedValue*): UIO[Unit] = - UIO.effectTotal(logger.trace(message, values :+ cause: _*)).when(errorEnabled) + UIO.effectTotal(logger.trace(message, values :+ cause: _*)).when(traceEnabled) } diff --git a/zio/logging/src/main/scala/tofu/logging/impl/URIOZLoggingImpl.scala b/zio/logging/src/main/scala/tofu/logging/impl/URIOZLoggingImpl.scala index f03d17b2b..e8c26609b 100644 --- a/zio/logging/src/main/scala/tofu/logging/impl/URIOZLoggingImpl.scala +++ b/zio/logging/src/main/scala/tofu/logging/impl/URIOZLoggingImpl.scala @@ -40,19 +40,19 @@ class URIOZLoggingImpl[R: Loggable](logger: Logger) extends LoggingImpl[URIO[R, override def traceCause(message: String, cause: Throwable, values: LoggedValue*): URIO[R, Unit] = URIO .accessM[R](ctx => UIO.effectTotal(logger.trace(ContextMarker(ctx), message, values :+ cause: _*))) - .when(errorEnabled) + .when(traceEnabled) override def debugCause(message: String, cause: Throwable, values: LoggedValue*): URIO[R, Unit] = URIO .accessM[R](ctx => UIO.effectTotal(logger.debug(ContextMarker(ctx), message, values :+ cause: _*))) - .when(errorEnabled) + .when(debugEnabled) override def infoCause(message: String, cause: Throwable, values: LoggedValue*): URIO[R, Unit] = URIO .accessM[R](ctx => UIO.effectTotal(logger.info(ContextMarker(ctx), message, values :+ cause: _*))) - .when(errorEnabled) + .when(infoEnabled) override def warnCause(message: String, cause: Throwable, values: LoggedValue*): URIO[R, Unit] = URIO .accessM[R](ctx => UIO.effectTotal(logger.warn(ContextMarker(ctx), message, values :+ cause: _*))) - .when(errorEnabled) + .when(warnEnabled) override def errorCause(message: String, cause: Throwable, values: LoggedValue*): URIO[R, Unit] = URIO .accessM[R](ctx => UIO.effectTotal(logger.error(ContextMarker(ctx), message, values :+ cause: _*)))