Made the boot process only require unique paths (to prevent loading h…

…ooks twice, for instance).
mtodd · Jul 1, 2008 · 64e656a · 64e656a
1 parent 2fec989
commit 64e656a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/halcyon/application.rb b/lib/halcyon/application.rb
@@ -307,13 +307,13 @@ def boot(&block)
         Halcyon.logger = Halcyon::Logger.setup(Halcyon.config[:logging])
 
         # Run initializers
-        Dir.glob(%w(requires hooks routes *).map{|init|Halcyon.paths[:init]/init+'.rb'}).each do |initializer|
+        Dir.glob(%w(requires hooks routes *).map{|init|Halcyon.paths[:init]/init+'.rb'}).uniq.each do |initializer|
           self.logger.debug "Init: #{File.basename(initializer).chomp('.rb').camel_case}" if
           require initializer.chomp('.rb')
         end
 
         # Setup autoloads for Controllers found in Halcyon.root/'app' (by default)
-        Dir.glob([Halcyon.paths[:controller]/'application.rb', Halcyon.paths[:controller]/'*.rb']).each do |controller|
+        Dir.glob([Halcyon.paths[:controller]/'application.rb', Halcyon.paths[:controller]/'*.rb']).uniq.each do |controller|
           self.logger.debug "Load: #{File.basename(controller).chomp('.rb').camel_case} Controller" if
           require controller.chomp('.rb')
         end