- socket: rescue transmit in close without logging

Author: palkan

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## main
 
+- Tolerate `#transmit` errors on `socket.close`.
+
 ## 0.3.2
 
 - Add `#advance_time` test helper to channels to test periodic timers.

lib/action_cable/connection/base.rb

@@ -133,12 +133,7 @@ def close(reason: nil, reconnect: true)
           type: ActionCable::INTERNAL[:message_types][:disconnect],
           reason: reason,
           reconnect: reconnect
-        )
-      rescue => error
-        # Ignore errors when transmitting the disconnect message, e.g. if the
-        # socket is already closed.
-        logger.error("Failed to transmit disconnect message: #{error.message}")
-      ensure
+        ) rescue nil
         socket.close
       end
 

test/connection/base_test.rb

@@ -72,7 +72,6 @@ def disconnect
     # prior restart call), so that transmitting the disconnect message raises.
     socket.stub(:transmit, ->(*) { raise ClosedQueueError, "queue closed" }) do
       assert_called(socket, :close) do
-        # Must not propagate the error — socket.close must still be reached via ensure.
         connection.close(reason: "server_restart")
       end
     end