aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable/channel
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2016-01-16 15:42:20 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2016-01-16 15:42:20 +0100
commit01c320001bcce617196270f3d398d48a89a6ea2a (patch)
tree18ca55a61b9bd0bd73bcad2f8f0dbc61dfc79f69 /actioncable/lib/action_cable/channel
parentf5065ef60c011a0d84224e74e1e8a0b882c36223 (diff)
downloadrails-01c320001bcce617196270f3d398d48a89a6ea2a.tar.gz
rails-01c320001bcce617196270f3d398d48a89a6ea2a.tar.bz2
rails-01c320001bcce617196270f3d398d48a89a6ea2a.zip
Revert "Merge pull request #22977 from rails/revert-22934-master"
This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25.
Diffstat (limited to 'actioncable/lib/action_cable/channel')
-rw-r--r--actioncable/lib/action_cable/channel/periodic_timers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/lib/action_cable/channel/periodic_timers.rb b/actioncable/lib/action_cable/channel/periodic_timers.rb
index 25fe8e5e54..7f0fb37afc 100644
--- a/actioncable/lib/action_cable/channel/periodic_timers.rb
+++ b/actioncable/lib/action_cable/channel/periodic_timers.rb
@@ -28,7 +28,7 @@ module ActionCable
def start_periodic_timers
self.class.periodic_timers.each do |callback, options|
active_periodic_timers << EventMachine::PeriodicTimer.new(options[:every]) do
- connection.worker_pool.async.run_periodic_timer(self, callback)
+ connection.worker_pool.async_run_periodic_timer(self, callback)
end
end
end