aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib
diff options
context:
space:
mode:
authorIlia Kasianenko <i.kasianenko@gmail.com>2018-12-12 15:42:34 +0200
committerIlia Kasianenko <i.kasianenko@gmail.com>2018-12-12 15:48:55 +0200
commit87f407db3ebac3dfaf53e19590e8707bd0183496 (patch)
treefcca452ddccfef3fa040936d138c9609f6709163 /actioncable/lib
parentc4f37cc8c5a3b1de5746146a0f65b22d418cfef4 (diff)
downloadrails-87f407db3ebac3dfaf53e19590e8707bd0183496.tar.gz
rails-87f407db3ebac3dfaf53e19590e8707bd0183496.tar.bz2
rails-87f407db3ebac3dfaf53e19590e8707bd0183496.zip
Add Missing ActiveSupport::Rescuable to ActionCable::Channel
[timthez, Ilia Kasianenko]
Diffstat (limited to 'actioncable/lib')
-rw-r--r--actioncable/lib/action_cable/channel/base.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actioncable/lib/action_cable/channel/base.rb b/actioncable/lib/action_cable/channel/base.rb
index 70c93ec0f3..ad0d3685cd 100644
--- a/actioncable/lib/action_cable/channel/base.rb
+++ b/actioncable/lib/action_cable/channel/base.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
require "set"
+require "active_support/rescuable"
module ActionCable
module Channel
@@ -99,6 +100,7 @@ module ActionCable
include Streams
include Naming
include Broadcasting
+ include ActiveSupport::Rescuable
attr_reader :params, :connection, :identifier
delegate :logger, to: :connection
@@ -267,6 +269,8 @@ module ActionCable
else
public_send action
end
+ rescue Exception => exception
+ rescue_with_handler(exception) || raise
end
def action_signature(action, data)