remove connection close timeout and add socket close timeout

Author: Alexandru Scvortov

projects/client/RabbitMQ.Client/src/client/impl/ConnectionBase.cs

@@ -69,11 +69,6 @@ public abstract class ConnectionBase : IConnection
         ///complete (milliseconds)</summary>
         public static int HandshakeTimeout = 10000;
 
-        ///<summary>Timeout used while waiting for a
-        ///connection.close-ok reply to a connection.close request
-        ///(milliseconds)</summary>
-        public static int ConnectionCloseTimeout = 10000;
-
         public ConnectionFactory m_factory;
         public IFrameHandler m_frameHandler;
         public uint m_frameMax = 0;
@@ -619,15 +614,14 @@ public void MainLoop()
                                                           "Unexpected Exception",
                                                           ex));
             }
-            
-            // If allowed for clean shutdown
-            // Run main loop for a limited amount of time (as defined
-            // by ConnectionCloseTimeout).
+
+            // If allowed for clean shutdown, run main loop until the
+            // connection closes.
             if (shutdownCleanly)
             {
                 ClosingLoop();
             }
-            
+
             FinishClose();
 
             m_appContinuation.Set();
@@ -731,16 +725,10 @@ public void ClosingLoop()
         {
             try
             {
-                m_frameHandler.Timeout = ConnectionCloseTimeout;
-                DateTime startTimeout = DateTime.Now;
+                m_frameHandler.Timeout = 0;
                 // Wait for response/socket closure or timeout
                 while (!m_closed)
                 {
-                    if ((DateTime.Now - startTimeout).TotalMilliseconds >= ConnectionCloseTimeout)
-                    {
-                        LogCloseError("Timeout, when waiting for server's response on close", null);
-                        break;
-                    }
                     MainLoopIteration();
                 }
             }

projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler_0_9.cs

@@ -49,9 +49,12 @@ namespace RabbitMQ.Client.Impl
 {
     public class SocketFrameHandler_0_9 : IFrameHandler
     {
-        public const int WSAEWOULDBLOCK = 10035; 
+        public const int WSAEWOULDBLOCK = 10035;
         // ^^ System.Net.Sockets.SocketError doesn't exist in .NET 1.1
 
+        // Timeout in seconds to wait for a clean socket close.
+        public const int SOCKET_CLOSING_TIMEOUT = 1;
+
         public AmqpTcpEndpoint m_endpoint;
         public TcpClient m_socket;
         public NetworkBinaryReader m_reader;
@@ -147,6 +150,7 @@ public void WriteFrame(Frame frame)
 
         public void Close()
         {
+            m_socket.LingerState = new LingerOption(true, SOCKET_CLOSING_TIMEOUT);
             m_socket.Close();
         }
     }