fix: remove incorrect raise exception within accept loop

Author: ademar

src/Suave/ConnectionFacade.fs

@@ -387,6 +387,7 @@ type ConnectionFacade(connection: Connection, runtime: HttpRuntime, connectionPo
     // Set the connection ID on the reader for consistent logging
     let mutable readTask : Task<Result<unit,Error>> = null
     try
+      try
         reader.init()
         readTask <- reader.readLoop()
         let! loopRes = this.requestLoop()
@@ -395,6 +396,9 @@ type ConnectionFacade(connection: Connection, runtime: HttpRuntime, connectionPo
         | Result.Error err ->
           if Globals.verbose then
             do Console.WriteLine(sprintf "[Conn:%d] accept: Error: %A" connectionId err)
+      with ex ->
+        if Globals.verbose then
+          do Console.WriteLine(sprintf "[Conn:%d] accept: Exception: %s" connectionId ex.Message)
     finally
       // First phase: stop reader and transport (this unblocks readTask)
       this.shutdown()

src/Suave/Sockets/HttpReader.fs

@@ -314,17 +314,21 @@ type HttpReader(transport : ITransport, pipe: Pipe, cancellationToken: Threading
     let mutable reading = true
     let mutable result = Ok()
     let mutable iterationCount = 0
-    while running && reading && not(readerCancellationTokenSource.IsCancellationRequested) do
-      iterationCount <- iterationCount + 1
-      let! a = this.readMoreData()
-      match a with
-      | Ok () -> ()
-      | Result.Error b as a ->
-        reading <- false
-        result <- a
-        this.stop()
-    try pipe.Writer.Complete() with _ -> ()
-    return result
+    try
+      while running && reading && not(readerCancellationTokenSource.IsCancellationRequested) do
+        iterationCount <- iterationCount + 1
+        let! a = this.readMoreData()
+        match a with
+        | Ok () -> ()
+        | Result.Error b as a ->
+          reading <- false
+          result <- a
+          this.stop()
+      try pipe.Writer.Complete() with _ -> ()
+      return result
+    with ex ->
+      try pipe.Writer.Complete() with _ -> ()
+      return Result.Error(Error.ConnectionError ex.Message)
   }
 
   // Return readLineBuffer to the ArrayPool when the reader is disposed

src/Suave/Tcp.fs

@@ -30,7 +30,8 @@ type StartedData =
     (x.GetStartedListeningElapsedMilliseconds()).ToString() + " ms with binding " + x.binding.ip.ToString() + ":"  + x.binding.port.ToString()
 
 /// Stop the TCP listener server
-let stopTcp reason (socket : Socket) =
+let stopTcp (reason:string) (socket : Socket) =
+  Console.WriteLine("Stopping TCP server due to {0}", reason)
   try
     socket.Dispose()
   with ex ->
@@ -198,7 +199,7 @@ let runServer maxConcurrentOps bufferSize (binding: SocketBinding) (runtime:Http
       let ipAddress = startData.binding.ip.ToString()
       let port = startData.binding.port
 
-      Console.WriteLine($"Smooth! Suave listener started in {startedListeningMilliseconds} ms with binding {ipAddress}:{port}")
+      Console.WriteLine($"Smooth! Suave v{Globals.SuaveVersion} listener started in {startedListeningMilliseconds} ms with binding {ipAddress}:{port}")
 
       let remoteBinding (socket : Socket) =
         let rep = socket.RemoteEndPoint :?> IPEndPoint
@@ -250,10 +251,8 @@ let runServer maxConcurrentOps bufferSize (binding: SocketBinding) (runtime:Http
                 // SSL handshake failed, return connection to pool
                 connectionPool.Push(connection)
           with ex ->
-            // Re-raise if not a cancellation exception
-            match ex with
-            | :? OperationCanceledException -> ()
-            | _ -> raise ex
+            if Globals.verbose then
+              Console.WriteLine("TCP server accept exception: {0}", ex)
 
       stopTcp "cancellation requested" listenSocket
     with
@@ -262,6 +261,7 @@ let runServer maxConcurrentOps bufferSize (binding: SocketBinding) (runtime:Http
       | :? TaskCanceledException ->
         stopTcp "The operation was canceled" listenSocket
       | ex ->
+        Console.WriteLine("TCP server runtime exception: {0}", ex)
         stopTcp "runtime exception" listenSocket
         }))