From c2dbc391a9292e6f73cadce2f0ba1be871b29e82 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Tue, 2 Mar 2010 13:05:25 -0800
Subject: Have log subscribers subscribe to the actual events, so the
 subscriber doesn't subscribe to *every* event, so we can have events that are
 slow-ish but are not actually run in production.

---
 railties/lib/rails/application/configuration.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'railties/lib/rails/application/configuration.rb')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index d6ad045294..a00f9c43ae 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -5,7 +5,7 @@ module Rails
     class Configuration < ::Rails::Engine::Configuration
       include ::Rails::Configuration::Deprecated
 
-      attr_accessor :allow_concurrency, :cache_classes, :cache_store, :colorize_logging,
+      attr_accessor :allow_concurrency, :cache_classes, :cache_store,
                     :consider_all_requests_local, :dependency_loading,
                     :filter_parameters,  :log_level, :logger, :metals,
                     :plugins, :preload_frameworks, :reload_engines, :reload_plugins,
@@ -14,7 +14,6 @@ module Rails
       def initialize(*)
         super
         @allow_concurrency   = false
-        @colorize_logging    = true
         @filter_parameters   = []
         @dependency_loading  = true
         @serve_static_assets = true
@@ -81,6 +80,16 @@ module Rails
       def log_level
         @log_level ||= Rails.env.production? ? :info : :debug
       end
+
+      def colorize_logging
+        @colorize_logging
+      end
+
+      def colorize_logging=(val)
+        @colorize_logging = val
+        Rails::LogSubscriber.colorize_logging = val
+        self.generators.colorize_logging = val
+      end
     end
   end
 end
\ No newline at end of file
-- 
cgit v1.2.3


From ae93789d9ad9095ca21784287464b760db12a095 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Mon, 8 Mar 2010 11:39:33 -0800
Subject: Move middlewares to the Application level. If you want to modify the
 middleware, either use Rails.application.config.middleware or modify it in an
 initializer (if you need to set it relative to user-specified middleware).

---
 railties/lib/rails/application/configuration.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'railties/lib/rails/application/configuration.rb')

diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index a00f9c43ae..d3a0ecb243 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -21,6 +21,10 @@ module Rails
         @consider_all_requests_local = true
       end
 
+      def middleware
+        @@default_middleware_stack ||= default_middleware
+      end
+
       def paths
         @paths ||= begin
           paths = super
-- 
cgit v1.2.3