FooBarWidget / passenger fork watch download tarball
public
Description: Phusion Passenger (mod_rails)
Homepage: http://www.modrails.com/
Clone URL: git://github.com/FooBarWidget/passenger.git
Click here to lend your support to: passenger and make a donation at www.pledgie.com ! 
Do not cache vendor Rails into a FrameworkSpawner. Instead, use 
ApplicationSpawner directly. This saves a bit of memory.
Hongli Lai (Phusion) (author)
Wed Jul 30 06:04:56 -0700 2008
commit  4bd40e1186d1266452813f2e725508eaa7f53ea5
tree    5ffbeea1e5307ae2ddc8e464394aacce7b4c27f9
parent  bd3e69cac10e65dda17d469cc48e789b3ba26275
0
lib/passenger/spawn_manager.rb 
...
193
194
195
196
197
198
199
200
201
202
203
204
 
205
206
207
 
...
193
194
195
 
 
 
 
 
 
 
 
 
196
197
198
199
 
0
@@ -193,15 +193,7 @@ private
0
     if spawn_method == "smart"
0
       spawner_must_be_started = true
0
       framework_version = Application.detect_framework_version(app_root)
0
-			if framework_version == :vendor
0
-				vendor_path = normalize_path("#{app_root}/vendor/rails")
0
-				key = "vendor:#{vendor_path}"
0
-				create_spawner = proc do
0
-					Railz::FrameworkSpawner.new(:vendor => vendor_path,
0
-						:app_spawner_timeout => app_spawner_timeout)
0
-				end
0
-				spawner_timeout = framework_spawner_timeout
0
-			elsif framework_version.nil?
0
+			if framework_version.nil? || framework_version == :vendor
0
         app_root = normalize_path(app_root)
0
         key = "app:#{app_root}"
0
         create_spawner = proc do
0
test/stub/vendor_rails/minimal/railties/lib/initializer.rb 
...
29
30
31
 
32
33
34
 
...
29
30
31
32
33
34
35
 
0
@@ -29,6 +29,7 @@ module Rails
0
       if defined?(RAILS_ROOT)
0
         $LOAD_PATH << "#{RAILS_ROOT}/app/controllers"
0
       end
0
+			$LOAD_PATH << "#{RAILS_FRAMEWORK_ROOT}/railties/lib"
0
     end
0
   
0
   protected

Comments

    No one has commented yet.