Seems #348 wasn't fully fixed: avoid throwing exceptions for now

causiq · Jun 13, 2018 · 5107b16 · 5107b16
1 parent 0d59135
commit 5107b16
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,6 @@
+#### 5.0.0-beta.18
+* Ref #348 — wait for buffers - don't throw exceptions; push fix till later
+
 #### 5.0.0-beta.17
 * Fix #348 — wait for buffers
 

diff --git a/examples/Libryy/LoggingV4.fs b/examples/Libryy/LoggingV4.fs
@@ -399,7 +399,8 @@ module Logger =
       | Result.Error Rejected ->
         Job.result ()
       | Result.Error (BufferFull target) ->
-        Job.raises (exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target))
+        //Job.raises (exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target))
+        Job.result ()
 
   /// Special case: e.g. Fatal messages.
   let logAck (logger: Logger) level messageFactory: Promise<unit> =
@@ -411,8 +412,9 @@ module Logger =
         | Result.Error Rejected ->
           IVar.fill ack ()
         | Result.Error (BufferFull target) ->
-          let e = exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target)
-          IVar.fillFailure ack e
+          //let e = exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target)
+          //IVar.fillFailure ack e
+          IVar.fill ack ()
     start inner
     ack :> Promise<_>
 

diff --git a/src/Logary.Facade/Facade.fs b/src/Logary.Facade/Facade.fs
@@ -399,7 +399,8 @@ module Logger =
       | Result.Error Rejected ->
         Job.result ()
       | Result.Error (BufferFull target) ->
-        Job.raises (exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target))
+        //Job.raises (exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target))
+        Job.result ()
 
   /// Special case: e.g. Fatal messages.
   let logAck (logger: Logger) level messageFactory: Promise<unit> =
@@ -411,8 +412,9 @@ module Logger =
         | Result.Error Rejected ->
           IVar.fill ack ()
         | Result.Error (BufferFull target) ->
-          let e = exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target)
-          IVar.fillFailure ack e
+          //let e = exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target)
+          //IVar.fillFailure ack e
+          IVar.fill ack ()
     start inner
     ack :> Promise<_>
 

diff --git a/src/Logary/LoggerModule.fs b/src/Logary/LoggerModule.fs
@@ -39,7 +39,8 @@ module Logger =
       | Result.Error Rejected ->
         Job.result ()
       | Result.Error (BufferFull target) ->
-        Job.raises (exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target))
+        //Job.raises (exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target))
+        Job.result ()
 
   /// Special case: e.g. Fatal messages.
   let logAck (logger: Logger) level messageFactory: Promise<unit> =
@@ -51,8 +52,9 @@ module Logger =
         | Result.Error Rejected ->
           IVar.fill ack ()
         | Result.Error (BufferFull target) ->
-          let e = exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target)
-          IVar.fillFailure ack e
+          //let e = exn (sprintf "logWithAck (true, _) should have waited for the RingBuffer(s) to accept the Message. Target(%s)" target)
+          //IVar.fillFailure ack e
+          IVar.fill ack ()
     start inner
     ack :> Promise<_>