aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable/channel/periodic_timers.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2015-11-04 17:22:48 -0600
committerPratik Naik <pratiknaik@gmail.com>2015-11-04 17:22:48 -0600
commitcb4ef80f20a23e9c42876b039d8af7d02fd416fb (patch)
tree5e8c2eaf367a9ee395f1213624ad42a08cbf4f06 /lib/action_cable/channel/periodic_timers.rb
parentee06b33e19019e771f0305a40b15885c22499a8b (diff)
parent7c1631fa48b8862f37d1026b4f0cf1061dd6947a (diff)
downloadrails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.tar.gz
rails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.tar.bz2
rails-cb4ef80f20a23e9c42876b039d8af7d02fd416fb.zip
Merge branch 'master' into subscription-rejection
Diffstat (limited to 'lib/action_cable/channel/periodic_timers.rb')
-rw-r--r--lib/action_cable/channel/periodic_timers.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/action_cable/channel/periodic_timers.rb b/lib/action_cable/channel/periodic_timers.rb
index 9bdcc87aa5..25fe8e5e54 100644
--- a/lib/action_cable/channel/periodic_timers.rb
+++ b/lib/action_cable/channel/periodic_timers.rb
@@ -7,8 +7,8 @@ module ActionCable
class_attribute :periodic_timers, instance_reader: false
self.periodic_timers = []
- on_subscribe :start_periodic_timers
- on_unsubscribe :stop_periodic_timers
+ after_subscribe :start_periodic_timers
+ after_unsubscribe :stop_periodic_timers
end
module ClassMethods
@@ -38,4 +38,4 @@ module ActionCable
end
end
end
-end \ No newline at end of file
+end