aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2012-01-27 23:01:14 +0900
committerkennyj <kennyj@gmail.com>2012-01-27 23:01:14 +0900
commit2e7d6ff08ddcb4f90f1ee78f28e102fb75990f0a (patch)
tree22750307c7fc88fd5bd963f78ab1f3ef7e0ecb0c
parentf22a0e2f1d55af4c16abbe29158d190053374a76 (diff)
downloadrails-2e7d6ff08ddcb4f90f1ee78f28e102fb75990f0a.tar.gz
rails-2e7d6ff08ddcb4f90f1ee78f28e102fb75990f0a.tar.bz2
rails-2e7d6ff08ddcb4f90f1ee78f28e102fb75990f0a.zip
Remove redundant instance_variables (@colorize_logging)
-rw-r--r--railties/lib/rails/application/configuration.rb3
-rw-r--r--railties/test/application/configuration_test.rb5
2 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 9e9d26a783..1ad08220ee 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -112,11 +112,10 @@ module Rails
end
def colorize_logging
- @colorize_logging
+ ActiveSupport::LogSubscriber.colorize_logging
end
def colorize_logging=(val)
- @colorize_logging = val
ActiveSupport::LogSubscriber.colorize_logging = val
self.generators.colorize_logging = val
end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index cadf60d46f..e58a5cb67d 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -534,5 +534,10 @@ module ApplicationTests
assert_equal app.env_config['action_dispatch.logger'], Rails.logger
assert_equal app.env_config['action_dispatch.backtrace_cleaner'], Rails.backtrace_cleaner
end
+
+ test "config.colorize_logging defaul is true" do
+ make_basic_app
+ assert app.config.colorize_logging
+ end
end
end