diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-12-12 15:30:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 15:30:44 +0100 |
| commit | 0fc6804c7e385140976520fd4d1a269eb735160b (patch) | |
| tree | 54d8cd9d085528674ce4a2df2f6f4517f0041285 /actioncable/lib | |
| parent | 7d83ef4f7bd9e5766ebdb438370621a98be06a7c (diff) | |
| parent | 87f407db3ebac3dfaf53e19590e8707bd0183496 (diff) | |
| download | rails-0fc6804c7e385140976520fd4d1a269eb735160b.tar.gz rails-0fc6804c7e385140976520fd4d1a269eb735160b.tar.bz2 rails-0fc6804c7e385140976520fd4d1a269eb735160b.zip | |
Merge pull request #34686 from got2be/actioncable-channel-rescuable
Add Missing ActiveSupport::Rescuable to ActionCable::Channel
Diffstat (limited to 'actioncable/lib')
| -rw-r--r-- | actioncable/lib/action_cable/channel/base.rb | 4 |
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) |