slf4j bridge - init lock with Semaphore

zio · Nov 22, 2023 · 05a5f71 · 05a5f71
1 parent 3251d5a
commit 05a5f71
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 29 deletions.
diff --git a/slf4j-bridge/src/main/scala/zio/logging/slf4j/bridge/Slf4jBridge.scala b/slf4j-bridge/src/main/scala/zio/logging/slf4j/bridge/Slf4jBridge.scala
@@ -16,9 +16,7 @@
 package zio.logging.slf4j.bridge
 
 import org.slf4j.impl.ZioLoggerFactory
-import zio.{ Runtime, ZIO, ZLayer }
-
-import java.util.concurrent.locks.ReentrantLock
+import zio.{ Runtime, Semaphore, Unsafe, ZIO, ZLayer }
 
 object Slf4jBridge {
 
@@ -48,18 +46,15 @@ object Slf4jBridge {
   def initialize(nameAnnotationKey: String): ZLayer[Any, Nothing, Unit] =
     Runtime.enableCurrentFiber ++ layer(nameAnnotationKey)
 
-  private val initLock: ReentrantLock = new ReentrantLock()
+  private val initLock = Semaphore.unsafe.make(1)(Unsafe.unsafe)
 
   private def layer(nameAnnotationKey: String): ZLayer[Any, Nothing, Unit] =
     ZLayer {
-      ZIO.runtime[Any].flatMap { runtime =>
-        ZIO.succeed {
-          initLock.lock()
-          try
-            ZioLoggerFactory.initialize(new ZioLoggerRuntime(runtime, nameAnnotationKey))
-          finally
-            initLock.unlock()
-        }
-      }
+      for {
+        runtime <- ZIO.runtime[Any]
+        _       <- initLock.withPermits(1) {
+                     ZIO.succeed(ZioLoggerFactory.initialize(new ZioLoggerRuntime(runtime, nameAnnotationKey)))
+                   }
+      } yield ()
     }
 }
diff --git a/slf4j2-bridge/src/main/scala/zio/logging/slf4j/bridge/Slf4jBridge.scala b/slf4j2-bridge/src/main/scala/zio/logging/slf4j/bridge/Slf4jBridge.scala
@@ -15,9 +15,7 @@
  */
 package zio.logging.slf4j.bridge
 
-import zio.{ Runtime, ZIO, ZLayer }
-
-import java.util.concurrent.locks.ReentrantLock
+import zio.{ Runtime, Semaphore, Unsafe, ZIO, ZLayer }
 
 object Slf4jBridge {
 
@@ -31,21 +29,20 @@ object Slf4jBridge {
    */
   def initializeWithoutFiberRefPropagation: ZLayer[Any, Nothing, Unit] = layer
 
-  private val initLock: ReentrantLock = new ReentrantLock()
+  private val initLock = Semaphore.unsafe.make(1)(Unsafe.unsafe)
 
   private def layer: ZLayer[Any, Nothing, Unit] =
     ZLayer {
-      ZIO.runtime[Any].flatMap { runtime =>
-        ZIO.succeed {
-          initLock.lock()
-          try
-            org.slf4j.LoggerFactory
-              .getILoggerFactory()
-              .asInstanceOf[LoggerFactory]
-              .attacheRuntime(new ZioLoggerRuntime(runtime))
-          finally
-            initLock.unlock()
-        }
-      }
+      for {
+        runtime <- ZIO.runtime[Any]
+        _       <- initLock.withPermits(1) {
+                     ZIO.succeed(
+                       org.slf4j.LoggerFactory
+                         .getILoggerFactory()
+                         .asInstanceOf[LoggerFactory]
+                         .attacheRuntime(new ZioLoggerRuntime(runtime))
+                     )
+                   }
+      } yield ()
     }
 }