aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorBjørn Arild Mæland <bjorn.maeland@gmail.com>2012-12-01 21:41:54 +0100
committerBjørn Arild Mæland <bjorn.maeland@gmail.com>2012-12-01 21:41:54 +0100
commitb9d1d2cddae952650b5f3fd3bbfc5ed7d80f95fc (patch)
treea5084ef70161b3ee12932bd32a780203cb77ac68 /railties
parent583cc11dd75676665e1d106541979d94864ee663 (diff)
downloadrails-b9d1d2cddae952650b5f3fd3bbfc5ed7d80f95fc.tar.gz
rails-b9d1d2cddae952650b5f3fd3bbfc5ed7d80f95fc.tar.bz2
rails-b9d1d2cddae952650b5f3fd3bbfc5ed7d80f95fc.zip
Use attr_accessor for Rails.{application,cache,logger}
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails.rb24
1 files changed, 1 insertions, 23 deletions
diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 6bf2d8db20..b6a9eccdb6 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -24,13 +24,7 @@ module Rails
autoload :InfoController, 'rails/info_controller'
class << self
- def application
- @application ||= nil
- end
-
- def application=(application)
- @application = application
- end
+ attr_accessor :application, :cache, :logger
# The Configuration instance used to configure the Rails environment
def configuration
@@ -64,14 +58,6 @@ module Rails
application.initialized?
end
- def logger
- @logger ||= nil
- end
-
- def logger=(logger)
- @logger = logger
- end
-
def backtrace_cleaner
@backtrace_cleaner ||= begin
# Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
@@ -95,14 +81,6 @@ module Rails
@_env = ActiveSupport::StringInquirer.new(environment)
end
- def cache
- @cache ||= nil
- end
-
- def cache=(cache)
- @cache = cache
- end
-
# Returns all rails groups for loading based on:
#
# * The Rails environment;