diff --git a/cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala b/cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala index bc2e56bb74e75a85eda90dfd692cf6c459bd0236..e80ecf2cb584c49d648fb82a61027b3877868454 100644 --- a/cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala +++ b/cacheable-caffeine/src/main/scala/org/bitlap/cacheable/caffeine/Implicits.scala @@ -37,7 +37,7 @@ object Implicits { override def evict(business: => ZStream[Any, Throwable, T])(identities: List[String]): ZStream[Any, Throwable, T] = { for { updateResult <- ZStream.fromIterable(identities).map(key => ZCaffeine.del(key)) *> business - _ <- if (ZCaffeine.disabledLog) ZStream.empty else LogUtils.debugS(s"Caffeine ZStream update: identities:[$identities], updateResult:[$updateResult]") + _ <- if (ZCaffeine.disabledLog) ZStream.unit else LogUtils.debugS(s"Caffeine ZStream update: identities:[$identities], updateResult:[$updateResult]") } yield updateResult } } @@ -48,9 +48,9 @@ object Implicits { val field = cacheField(args) for { cacheValue <- ZStream.fromEffect(ZCaffeine.hGet[T](key, field)) - _ <- if (ZCaffeine.disabledLog) ZStream.empty else LogUtils.debugS(s"Caffeine ZStream getIfPresent: identity:[$key],field:[$field],cacheValue:[$cacheValue]") + _ <- if (ZCaffeine.disabledLog) ZStream.unit else LogUtils.debugS(s"Caffeine ZStream getIfPresent: identity:[$key],field:[$field],cacheValue:[$cacheValue]") result <- cacheValue.fold(business.mapM(r => ZCaffeine.hSet(key, field, r).as(r)))(value => ZStream.fromEffect(ZIO.effectTotal(value))) - _ <- LogUtils.debugS(s"Caffeine ZStream getIfPresent: identity:[$key],field:[$field],result:[$result]") + _ <- if (ZCaffeine.disabledLog) ZStream.unit else LogUtils.debugS(s"Caffeine ZStream getIfPresent: identity:[$key],field:[$field],result:[$result]") } yield result } } diff --git a/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala b/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala index 4285a23aaffbba358ab944aadf32e5c89c06e9be..6c1616af1b48cc87c132851ac34d37567dee64ce 100644 --- a/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala +++ b/cacheable-redis/src/main/scala/org/bitlap/cacheable/redis/Implicits.scala @@ -38,7 +38,7 @@ object Implicits { override def evict(business: => ZStream[Any, Throwable, T])(identities: List[String]): ZStream[Any, Throwable, T] = { for { updateResult <- ZStream.fromIterable(identities).map(key => ZRedisService.del(key)) *> business - _ <- if (ZRedisConfiguration.disabledLog) ZStream.empty else LogUtils.debugS(s"Redis ZStream update: identities:[$identities], updateResult:[$updateResult]") + _ <- if (ZRedisConfiguration.disabledLog) ZStream.unit else LogUtils.debugS(s"Redis ZStream update: identities:[$identities], updateResult:[$updateResult]") } yield updateResult } } @@ -49,9 +49,9 @@ object Implicits { val field = cacheField(args) for { cacheValue <- ZStream.fromEffect(ZRedisService.hGet[T](key, field)) - _ <- if (ZRedisConfiguration.disabledLog) ZStream.empty else LogUtils.debugS(s"Redis ZStream getIfPresent: identity:[$key],field:[$field],cacheValue:[$cacheValue]") + _ <- if (ZRedisConfiguration.disabledLog) ZStream.unit else LogUtils.debugS(s"Redis ZStream getIfPresent: identity:[$key],field:[$field],cacheValue:[$cacheValue]") result <- cacheValue.fold(business.mapM(r => ZRedisService.hSet[T](key, field, r).as(r)))(value => ZStream.fromEffect(ZIO.effectTotal(value))) - _ <- if (ZRedisConfiguration.disabledLog) ZStream.empty else LogUtils.debugS(s"Redis ZStream getIfPresent: identity:[$key],field:[$field],result:[$result]") + _ <- if (ZRedisConfiguration.disabledLog) ZStream.unit else LogUtils.debugS(s"Redis ZStream getIfPresent: identity:[$key],field:[$field],result:[$result]") } yield result } }