The rake task :environment now loads config/environment.rb instead of initializing the application on its own. This fixes [#4492 state:resolved] and also avoids the application being initialized twice in some rake tasks.

1 files changed, 7 insertions, 5 deletions

diff --git a/activesupport/lib/active_support/cache/strategy/local_cache.rb b/activesupport/lib/active_support/cache/strategy/local_cache.rb
index 81002da0a8..efb5ad26ab 100644
--- a/activesupport/lib/active_support/cache/strategy/local_cache.rb
+++ b/activesupport/lib/active_support/cache/strategy/local_cache.rb
@@ -56,6 +56,13 @@ module ActiveSupport
           @middleware ||= begin
             klass = Class.new
             klass.class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+              class << self
+                def name
+                  "ActiveSupport::Cache::Strategy::LocalCache"
+                end
+                alias :to_s :name
+              end
+
               def initialize(app)
                 @app = app
               end
@@ -67,11 +74,6 @@ module ActiveSupport
                 Thread.current[:#{thread_local_key}] = nil
               end
             EOS
-
-            def klass.to_s
-              "ActiveSupport::Cache::Strategy::LocalCache"
-            end
-
             klass
           end
         end