aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/channel
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-07-06 19:46:43 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-07-07 19:03:57 +0200
commit6fe8a87ed23fb2de8ad2d950e483f54cb723ac40 (patch)
tree6ad25acad8af3172da895943c9f4685293316f59 /lib/action_cable/channel
parente6effb247a8051d21c2e9bdeed6c48a511f16b28 (diff)
downloadrails-6fe8a87ed23fb2de8ad2d950e483f54cb723ac40.tar.gz
rails-6fe8a87ed23fb2de8ad2d950e483f54cb723ac40.tar.bz2
rails-6fe8a87ed23fb2de8ad2d950e483f54cb723ac40.zip
Don't need a delegator for a single-use case
Diffstat (limited to 'lib/action_cable/channel')
-rw-r--r--lib/action_cable/channel/base.rb5
-rw-r--r--lib/action_cable/channel/periodic_timers.rb2
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/action_cable/channel/base.rb b/lib/action_cable/channel/base.rb
index cf5f593a31..49d335efea 100644
--- a/lib/action_cable/channel/base.rb
+++ b/lib/action_cable/channel/base.rb
@@ -104,11 +104,6 @@ module ActionCable
def run_unsubscribe_callbacks
self.class.on_unsubscribe_callbacks.each { |callback| send(callback) }
end
-
-
- def worker_pool
- connection.worker_pool
- end
end
end
end
diff --git a/lib/action_cable/channel/periodic_timers.rb b/lib/action_cable/channel/periodic_timers.rb
index d7f6b52e3d..33b9ff19be 100644
--- a/lib/action_cable/channel/periodic_timers.rb
+++ b/lib/action_cable/channel/periodic_timers.rb
@@ -25,7 +25,7 @@ module ActionCable
def start_periodic_timers
self.class.periodic_timers.each do |callback, options|
active_periodic_timers << EventMachine::PeriodicTimer.new(options[:every]) do
- worker_pool.async.run_periodic_timer(self, callback)
+ connection.worker_pool.async.run_periodic_timer(self, callback)
end
end
end