aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-06-26 19:11:21 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-06-26 19:11:21 +0200
commit85272d8a91aa2a08a4f83100e24cb1b0c8c9ccf3 (patch)
treeacd2366ad14831fbb983fbdf2b424e786dac96a9 /lib/action_cable
parent2ecc9b513821a7ebf365f42f2061e4e4300cf6d3 (diff)
downloadrails-85272d8a91aa2a08a4f83100e24cb1b0c8c9ccf3.tar.gz
rails-85272d8a91aa2a08a4f83100e24cb1b0c8c9ccf3.tar.bz2
rails-85272d8a91aa2a08a4f83100e24cb1b0c8c9ccf3.zip
Don't need a log_exception helper, just do it inline
Diffstat (limited to 'lib/action_cable')
-rw-r--r--lib/action_cable/connection/base.rb4
-rw-r--r--lib/action_cable/connection/subscriptions.rb3
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/action_cable/connection/base.rb b/lib/action_cable/connection/base.rb
index fe5f058824..aac23b2596 100644
--- a/lib/action_cable/connection/base.rb
+++ b/lib/action_cable/connection/base.rb
@@ -142,10 +142,6 @@ module ActionCable
end
- def log_exception(e)
- logger.error "Exception raised #{e.class} - #{e.message}: #{e.backtrace.first(5).join(" | ")}"
- end
-
def log_tags
server.log_tags.map { |tag| tag.respond_to?(:call) ? tag.call(request) : tag.to_s.camelize }
end
diff --git a/lib/action_cable/connection/subscriptions.rb b/lib/action_cable/connection/subscriptions.rb
index e0a3a133c5..9e7a8a5f73 100644
--- a/lib/action_cable/connection/subscriptions.rb
+++ b/lib/action_cable/connection/subscriptions.rb
@@ -15,8 +15,7 @@ module ActionCable
logger.error "Received unrecognized command in #{data.inspect}"
end
rescue Exception => e
- logger.error "Could not execute command from #{data.inspect})"
- connection.log_exception(e)
+ logger.error "Could not execute command from #{data.inspect}) [#{e.class} - #{e.message}]: #{e.backtrace.first(5).join(" | ")}"
end
def add(data)