diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-01-22 04:14:03 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-01-24 22:54:04 +1030 |
| commit | 503fe757c7f5f917deab95acdcd421a1dede05c7 (patch) | |
| tree | 40e3ee39aecebd0967a932e1516271c5d44c134d | |
| parent | 322dca293b3716ccaa09e7e82046e539b0d2ffda (diff) | |
| download | rails-503fe757c7f5f917deab95acdcd421a1dede05c7.tar.gz rails-503fe757c7f5f917deab95acdcd421a1dede05c7.tar.bz2 rails-503fe757c7f5f917deab95acdcd421a1dede05c7.zip | |
Ditch the EM error logging helper
We're no longer doing our work in the EM event loop, so errors are quite
unlikely, and if they do occur, they're not really our responsibility to
handle.
| -rw-r--r-- | actioncable/lib/action_cable/process/logging.rb | 8 | ||||
| -rw-r--r-- | actioncable/test/subscription_adapter/common.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config.ru.tt | 3 |
3 files changed, 1 insertions, 11 deletions
diff --git a/actioncable/lib/action_cable/process/logging.rb b/actioncable/lib/action_cable/process/logging.rb deleted file mode 100644 index ebb8990891..0000000000 --- a/actioncable/lib/action_cable/process/logging.rb +++ /dev/null @@ -1,8 +0,0 @@ -require 'action_cable/server' - -if defined?(::EventMachine) - EventMachine.error_handler do |e| - puts "Error raised inside the event loop: #{e.message}" - puts e.backtrace.join("\n") - end -end diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb index 5efc6d6b81..361858784e 100644 --- a/actioncable/test/subscription_adapter/common.rb +++ b/actioncable/test/subscription_adapter/common.rb @@ -1,7 +1,6 @@ require 'test_helper' require 'concurrent' -require 'action_cable/process/logging' require 'active_support/core_ext/hash/indifferent_access' require 'pathname' diff --git a/railties/lib/rails/generators/rails/app/templates/config.ru.tt b/railties/lib/rails/generators/rails/app/templates/config.ru.tt index 70556fcc99..343c0833d7 100644 --- a/railties/lib/rails/generators/rails/app/templates/config.ru.tt +++ b/railties/lib/rails/generators/rails/app/templates/config.ru.tt @@ -3,9 +3,8 @@ require ::File.expand_path('../config/environment', __FILE__) <%- unless options[:skip_action_cable] -%> -# Action Cable uses EventMachine which requires that all classes are loaded in advance +# Action Cable requires that all classes are loaded in advance Rails.application.eager_load! -require 'action_cable/process/logging' <%- end -%> run Rails.application |