Fix FAutoCloseableOps.toAutoCloseable

avast · Dec 6, 2018 · e6a8562 · e6a8562
1 parent 89d7796
commit e6a8562
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/core/src/main/scala/com/avast/clients/rabbitmq/rabbitmq.scala b/core/src/main/scala/com/avast/clients/rabbitmq/rabbitmq.scala
@@ -3,7 +3,7 @@ package com.avast.clients
 import java.util.concurrent.Executors
 
 import cats.arrow.FunctionK
-import cats.effect.{Effect, IO}
+import cats.effect.Effect
 import cats.~>
 import com.avast.bytes.Bytes
 import com.avast.clients.rabbitmq.api._
@@ -189,11 +189,9 @@ package object rabbitmq {
   }
 
   implicit class FAutoCloseableOps[F[_]](val fac: FAutoCloseable[F]) extends AnyVal {
-    def toAutoCloseable(timeout: Duration = 1.minute)(implicit F: Effect[F]): AutoCloseable = () => {
-      IO.async[Unit] { cb =>
-          F.runAsync(fac.close())(cb2 => IO(cb(cb2)))
-        }
-        .unsafeRunTimed(timeout)
+    def toAutoCloseable(timeout: Duration = 1.minute)(implicit F: Effect[F], ec: ExecutionContext): AutoCloseable = () => {
+      implicit val scheduler = Scheduler(ec)
+      Task.fromEffect(fac.close()).runSyncUnsafe(timeout)
     }
   }