aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-09 00:28:46 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-07-09 00:28:46 -0300
commit244c6bf7a4b1144234464761121d317d5acb15ec (patch)
treeeaf1ab1954e0facab91c4610ef0100c97c4d1b50
parent66cb38533f5d6174d7180e11ba556ac83d4dd25c (diff)
parent6c0afaf967b2897a6f998da70814cd694a7fe1f1 (diff)
downloadrails-244c6bf7a4b1144234464761121d317d5acb15ec.tar.gz
rails-244c6bf7a4b1144234464761121d317d5acb15ec.tar.bz2
rails-244c6bf7a4b1144234464761121d317d5acb15ec.zip
Merge pull request #8 from packagethief/singleton-server
ActionCable.server should always return the same instance
-rw-r--r--lib/action_cable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index 5f1f3bec35..fac83cb4c3 100644
--- a/lib/action_cable.rb
+++ b/lib/action_cable.rb
@@ -28,6 +28,6 @@ module ActionCable
# Singleton instance of the server
module_function def server
- ActionCable::Server::Base.new
+ @server ||= ActionCable::Server::Base.new
end
end