Finish porting #1145 to main

rabbitmq · Feb 23, 2022 · 015bc51 · 015bc51
1 parent a3a5e05
commit 015bc51
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -87,7 +87,8 @@ public Connection(IConnectionFactory factory, IFrameHandler frameHandler, string
             }
             catch
             {
-                TerminateMainloop();
+                var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen");
+                Close(ea, true, TimeSpan.FromSeconds(5));
                 throw;
             }
         }

diff --git a/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs b/projects/RabbitMQ.Client/client/impl/SocketFrameHandler.cs
@@ -203,17 +203,18 @@ public void Close()
                     try
                     {
                         _channelWriter.Complete();
-                        _writerTask.GetAwaiter().GetResult();
+                        _writerTask?.GetAwaiter().GetResult();
                     }
-                    catch (Exception)
+                    catch
                     {
+                        // ignore, we are closing anyway
                     }
 
                     try
                     {
                         _socket.Close();
                     }
-                    catch (Exception)
+                    catch
                     {
                         // ignore, we are closing anyway
                     }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 catch
                 {
-                    TerminateMainloop();
+                    var ea = new ShutdownEventArgs(ShutdownInitiator.Library, Constants.InternalError, "FailedOpen");
+                    Close(ea, true, TimeSpan.FromSeconds(5));
                     throw;
                 }
             }
@@ Expand Down @@