From 125a8445f304348d3e530e85b30991c2346155fd Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 21 Jun 2015 21:44:22 +0200
Subject: Don't namespace methods with the class we are already in

---
 lib/action_cable/connection/base.rb | 4 ++--
 lib/action_cable/server.rb          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/action_cable')

diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index f6beda1c57..d96216edc2 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -83,10 +83,10 @@ module ActionCable
 
 
       def handle_exception
-        close_connection
+        close
       end
 
-      def close_connection
+      def close
         logger.error "Closing connection"
         @websocket.close
       end
diff --git a/lib/action_cable/server.rb b/lib/action_cable/server.rb
index 322fc85519..3a16f51757 100644
--- a/lib/action_cable/server.rb
+++ b/lib/action_cable/server.rb
@@ -34,7 +34,7 @@ module ActionCable
         redis.on(:reconnect_failed) do
           logger.info "[ActionCable] Redis reconnect failed."
           # logger.info "[ActionCable] Redis reconnected. Closing all the open connections."
-          # @connections.map &:close_connection
+          # @connections.map &:close
         end
         redis
       end
-- 
cgit v1.2.3