From 87f407db3ebac3dfaf53e19590e8707bd0183496 Mon Sep 17 00:00:00 2001
From: Ilia Kasianenko <i.kasianenko@gmail.com>
Date: Wed, 12 Dec 2018 15:42:34 +0200
Subject: Add Missing ActiveSupport::Rescuable to ActionCable::Channel

[timthez, Ilia Kasianenko]
---
 actioncable/lib/action_cable/channel/base.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'actioncable/lib')

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)
-- 
cgit v1.2.3