zio2.0.15 with logback.xml ( no logback-test)

ollls · Jun 20, 2023 · dbcffd6 · dbcffd6
1 parent 851e743
commit dbcffd6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,5 +1,5 @@
-ThisBuild / scalaVersion         := "3.2.1"
-ThisBuild / version              := "2.0.0"
+ThisBuild / scalaVersion         := "3.3.0"
+ThisBuild / version              := "2.0.1"
 ThisBuild / organization         := "io.github.ollls"
 ThisBuild / organizationName     := "ollls"
 ThisBuild / versionScheme        := Some("strict")
@@ -48,10 +48,10 @@ lazy val root = (project in file("."))
     name                                   := "zio-tls-http",
     maxErrors                              := 3,
     retrieveManaged                        := true,
-    libraryDependencies += "dev.zio"       %% "zio"               % "2.0.8" % "provided",
-    libraryDependencies += "dev.zio"       %% "zio-test"          % "2.0.8",
-    libraryDependencies += "dev.zio"       %% "zio-json"          % "0.4.2",
-    libraryDependencies += "dev.zio"       %% "zio-logging-slf4j" % "2.1.5",
+    libraryDependencies += "dev.zio"       %% "zio"               % "2.0.15",
+    libraryDependencies += "dev.zio"       %% "zio-test"          % "2.0.15",
+    libraryDependencies += "dev.zio"       %% "zio-json"          % "0.5.0",
+    libraryDependencies += "dev.zio"       %% "zio-logging-slf4j" % "2.1.13",
     libraryDependencies += "org.slf4j"      % "slf4j-api"         % "2.0.4",
     libraryDependencies += "ch.qos.logback" % "logback-classic"   % "1.3.5"
   )

diff --git a/src/main/resources/logback-test.xml → src/main/resources/logback.xml b/src/main/resources/logback-test.xml → src/main/resources/logback.xml
diff --git a/src/main/scala/server/FileUtils.scala b/src/main/scala/server/FileUtils.scala
@@ -71,7 +71,7 @@ object FileUtils {
       //https://zio.dev/zio-logging/slf4j
       //access
       //_ <- Logs.log_access(req, StatusCode.OK, body.size)
-       _ <- ZIO.logInfo( req.method.toString + " " + req.uri.toString() + " " + StatusCode.OK.value + " " + body.size ) @@ SLF4J.loggerName( "access")
+       _ <- ZIO.logInfo( req.method.toString + " " + req.uri.toString() + " " + StatusCode.OK.value + " " + body.size ) @@ zio.logging.loggerName("access")
       s <-
         if (file_name.toString.endsWith(".jpg")) {
           ZIO.attempt(headerStream("image/jpeg", file_path.toString) ++ fstream)

diff --git a/src/main/scala/server/HttpRouter.scala b/src/main/scala/server/HttpRouter.scala
@@ -379,7 +379,7 @@ class HttpRouter[Env](val appRoutes: List[HttpRoutes[Env]]) {
 
       if (resp.isChunked) {
         ZIO.logDebug(req.method.toString + " " + req.uri.toString() + "  " + status.value + " chunked") *>
-        ZIO.logInfo(req.method.toString + " " + req.uri.toString() + "  " + status.value + " chunked") @@ SLF4J.loggerName("access") *>
+        ZIO.logInfo(req.method.toString + " " + req.uri.toString() + "  " + status.value + " chunked") @@ zio.logging.loggerName("access") *>
           ResponseWriters.writeFullResponseFromStream(ch, resp).refineToOrDie[Exception].map(_ => 0)
       } else
         (for {
@@ -397,7 +397,7 @@ class HttpRouter[Env](val appRoutes: List[HttpRoutes[Env]]) {
             case _ => ResponseWriters.writeNoBodyResponse(ch, status, new String(body.toArray), true)
           }
           _ <- ZIO.logDebug(req.method.toString + " " + req.uri.toString() + "  " + status.value + " " + body.size)
-          _ <- ZIO.logInfo(req.method.toString + " " + req.uri.toString() + "  " + status.value + " " + body.size) @@ SLF4J.loggerName("access")
+          _ <- ZIO.logInfo(req.method.toString + " " + req.uri.toString() + "  " + status.value + " " + body.size) @@ zio.logging.loggerName("access")
 
         } yield (0)).refineToOrDie[Exception]