Can't put the threadsafe in application.rb after all

just3ws · just3ws · commit 38a164b51107 · 2014-07-10T17:33:30.000-05:00
diff --git a/config/application.rb b/config/application.rb
@@ -7,8 +7,6 @@
 
 module Badgiy
   class Application < Rails::Application
-    config.threadsafe! unless $rails_rake_task
-
     config.autoload_paths += %W(#{config.root}/app)
 
     config.autoload_paths += Dir[ Rails.root.join('app', 'models',      'concerns', '**/') ]
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -1,4 +1,6 @@
 Badgiy::Application.configure do
+  config.threadsafe! unless $rails_rake_task
+
   config.action_controller.perform_caching = false
   config.action_dispatch.best_standards_support = :builtin
   config.action_mailer.delivery_method = :letter_opener
@@ -18,7 +20,7 @@
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
   config.active_record.auto_explain_threshold_in_seconds = 0.5
-  
+
   # Move cache dir's out of vagrant NFS directory
   config.cache_store = [:file_store,"/tmp/codewall-cache/"]
   config.assets.cache_store = [:file_store,"/tmp/codewall-cache/assets/"]
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -1,5 +1,5 @@
 Badgiy::Application.configure do
-
+  config.threadsafe! unless $rails_rake_task
   config.cache_classes = true
   config.consider_all_requests_local = false
   config.action_controller.perform_caching = true
diff --git a/config/environments/test.rb b/config/environments/test.rb
@@ -1,4 +1,5 @@
 Badgiy::Application.configure do
+  config.threadsafe! unless $rails_rake_task
   config.cache_classes = false
   config.whiny_nils = true
   config.consider_all_requests_local = true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`Badgiy::Application.configure do`
	`2`	`+ config.threadsafe! unless $rails_rake_task`
`2`	`3`	`config.cache_classes = false`
`3`	`4`	`config.whiny_nils = true`
`4`	`5`	`config.consider_all_requests_local = true`