diff options
| -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 |