From 72a95cd4f9fad232812735a0b3c3426af3da2b69 Mon Sep 17 00:00:00 2001 From: "zio-scala-steward[bot]" <145262613+zio-scala-steward[bot]@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:44:58 +0800 Subject: [PATCH] Update zio-logging to 2.2.2 (#2989) * Update zio-logging to 2.2.2 * Make code compile with zio-logging v2.2+ --------- Co-authored-by: zio-scala-steward[bot] <145262613+zio-scala-steward[bot]@users.noreply.github.com> Co-authored-by: Jules Ivanic --- build.sbt | 2 +- .../src/main/scala/io/getquill/util/QueryLogger.scala | 2 +- quill-core/src/main/scala/zio/logging/extensions.scala | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index 8b1edb3ac2..ae931b18a2 100644 --- a/build.sbt +++ b/build.sbt @@ -219,7 +219,7 @@ lazy val `quill-core` = .settings( libraryDependencies ++= Seq( "com.typesafe" % "config" % "1.4.3", - "dev.zio" %% "zio-logging" % "2.1.17", + "dev.zio" %% "zio-logging" % "2.2.2", "dev.zio" %% "zio" % Version.zio, "dev.zio" %% "zio-streams" % Version.zio, "com.typesafe.scala-logging" %% "scala-logging" % "3.9.5" diff --git a/quill-core/src/main/scala/io/getquill/util/QueryLogger.scala b/quill-core/src/main/scala/io/getquill/util/QueryLogger.scala index c3b357ec1c..dd6bd133e3 100644 --- a/quill-core/src/main/scala/io/getquill/util/QueryLogger.scala +++ b/quill-core/src/main/scala/io/getquill/util/QueryLogger.scala @@ -18,7 +18,7 @@ class QueryLogger(logToFile: LogToFile) { FileLoggerConfig( destination = Paths.get(logFile), format = LogFormat.line, - filter = LogFilter.logLevel(LogLevel.Info) + filter = LogFilter.LogLevelByNameConfig.default ) executeWithLogger(config) { diff --git a/quill-core/src/main/scala/zio/logging/extensions.scala b/quill-core/src/main/scala/zio/logging/extensions.scala index 588dd54063..2150f085ad 100644 --- a/quill-core/src/main/scala/zio/logging/extensions.scala +++ b/quill-core/src/main/scala/zio/logging/extensions.scala @@ -33,11 +33,11 @@ object extensions { * See: * - https://github.com/zio/zio-logging/blob/v2.1.14/core/shared/src/main/scala/zio/logging/package.scala#L459-L468 */ - def makeFileLogger(config: FileLoggerConfig): ZIO[Scope, Throwable, ZLogger[String, Any]] = + private def makeFileLogger(config: FileLoggerConfig): ZIO[Scope, Throwable, ZLogger[String, Any]] = makeFileLogger( config.destination, config.format.toLogger, - config.filter, + config.filter.toFilter, config.charset, config.autoFlushBatchSize, config.bufferedIOSize, @@ -54,7 +54,7 @@ object extensions { * See: * - https://github.com/zio/zio-logging/blob/v2.1.14/core/shared/src/main/scala/zio/logging/package.scala#L470-L491 */ - def makeFileLogger( + private def makeFileLogger( destination: Path, logger: ZLogger[String, String], logFilter: LogFilter[String],