diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-05 11:19:09 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-01-05 11:19:09 -0800 |
commit | 64c82f9ec6b2ba15c185bec223548c79a6ec0d0d (patch) | |
tree | cd52fdce16dffe9da2c3eef65649dca7be1e666d /railties/lib/rails/application/configuration.rb | |
parent | c7dce2c7b2a9e27753f5e1c71fae677c31207087 (diff) | |
download | rails-64c82f9ec6b2ba15c185bec223548c79a6ec0d0d.tar.gz rails-64c82f9ec6b2ba15c185bec223548c79a6ec0d0d.tar.bz2 rails-64c82f9ec6b2ba15c185bec223548c79a6ec0d0d.zip |
only define log_level reader once, make sure to initialize @log_level
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 8cd496781b..c74bcbedf2 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -6,25 +6,28 @@ module Rails class Configuration < ::Rails::Engine::Configuration attr_accessor :allow_concurrency, :asset_host, :cache_classes, :cache_store, :encoding, :consider_all_requests_local, :dependency_loading, - :filter_parameters, :helpers_paths, :log_level, :logger, + :filter_parameters, :helpers_paths, :logger, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, :time_zone, :whiny_nils + attr_writer :log_level + def initialize(*) super self.encoding = "utf-8" - @allow_concurrency = false + @allow_concurrency = false @consider_all_requests_local = false - @filter_parameters = [] - @helpers_paths = [] - @dependency_loading = true - @serve_static_assets = true - @session_store = :cookie_store - @session_options = {} - @time_zone = "UTC" - @middleware = app_middleware - @generators = app_generators + @filter_parameters = [] + @helpers_paths = [] + @dependency_loading = true + @serve_static_assets = true + @session_store = :cookie_store + @session_options = {} + @time_zone = "UTC" + @log_level = nil + @middleware = app_middleware + @generators = app_generators end def compiled_asset_path |