aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/initializable.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-06-24 01:37:58 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-06-24 02:04:00 -0700
commitcdb8609c64ed7db7ea91cdcd4bcb4b400f7dfe07 (patch)
tree1abfc091b41bb7dc5d31452cc4dac3a16a72bc7f /railties/lib/rails/initializable.rb
parent60ab9255f0cb09ee5d2891878f715f301ad7a213 (diff)
downloadrails-cdb8609c64ed7db7ea91cdcd4bcb4b400f7dfe07.tar.gz
rails-cdb8609c64ed7db7ea91cdcd4bcb4b400f7dfe07.tar.bz2
rails-cdb8609c64ed7db7ea91cdcd4bcb4b400f7dfe07.zip
Speed up boot by tsorting as infrequently as possible
Diffstat (limited to 'railties/lib/rails/initializable.rb')
-rw-r--r--railties/lib/rails/initializable.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 9a82e051e7..78f9eaf393 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -39,11 +39,6 @@ module Rails
select { |i| i.before == initializer.name || i.name == initializer.after }.each(&block)
end
- def initialize(initializers = [])
- super(initializers)
- replace(tsort)
- end
-
def +(other)
Collection.new(to_a + other.to_a)
end
@@ -51,7 +46,7 @@ module Rails
def run_initializers(*args)
return if instance_variable_defined?(:@ran)
- initializers.each do |initializer|
+ initializers.tsort.each do |initializer|
initializer.run(*args)
end
@ran = true
@@ -94,4 +89,4 @@ module Rails
end
end
end
-end \ No newline at end of file
+end