Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #4722 from kennyj/fix_4708

Remove redundant instance variables (@colorize_logging)
  • Loading branch information...
commit 578c94ad025cc25b04473fbce687a4991c6348ed 2 parents 25d5c94 + 2e7d6ff
@tenderlove tenderlove authored
View
3  railties/lib/rails/application/configuration.rb
@@ -112,11 +112,10 @@ def log_level
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
View
5 railties/test/application/configuration_test.rb
@@ -534,5 +534,10 @@ def index
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

0 comments on commit 578c94a

Please sign in to comment.
Something went wrong with that request. Please try again.