aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-01-22 04:14:03 +1030
committerMatthew Draper <matthew@trebex.net>2016-01-24 22:54:04 +1030
commit503fe757c7f5f917deab95acdcd421a1dede05c7 (patch)
tree40e3ee39aecebd0967a932e1516271c5d44c134d /railties
parent322dca293b3716ccaa09e7e82046e539b0d2ffda (diff)
downloadrails-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.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config.ru.tt3
1 files changed, 1 insertions, 2 deletions
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