0
@@ -219,6 +219,9 @@ private
0
       Rails::Initializer.run(:set_load_path)
0
     end
0
     require 'config/environment'
0
+		if !defined?(Dispatcher)
0
+			require 'dispatcher'
0
+		end
0
     require_dependency 'application'
0
     Dir.glob('app/{models,controllers,helpers}/*.rb').each do |file|
0
       require_dependency normalize_path(file)

0
@@ -37,8 +37,8 @@ end
0
 # *Note*: FrameworkSpawner may only be started asynchronously with AbstractServer#start.
0
 # Starting it synchronously with AbstractServer#start_synchronously has not been tested.
0
 class FrameworkSpawner < AbstractServer
0
-	APP_SPAWNER_CLEAN_INTERVAL = 125
0
   APP_SPAWNER_MAX_IDLE_TIME = 120
0
+	APP_SPAWNER_CLEAN_INTERVAL = APP_SPAWNER_MAX_IDLE_TIME + 5
0
 
0
   include Utils
0
   

0
@@ -21,8 +21,10 @@ module Passenger
0
 # finished.
0
 class SpawnManager < AbstractServer
0
   DEFAULT_INPUT_FD = 3
0
-	SPAWNER_CLEAN_INTERVAL = 30 * 60
0
-	SPAWNER_MAX_IDLE_TIME = 29 * 60
0
+	FRAMEWORK_SPAWNER_MAX_IDLE_TIME = 30 * 60
0
+	APP_SPAWNER_MAX_IDLE_TIME = FrameworkSpawner::APP_SPAWNER_MAX_IDLE_TIME
0
+	SPAWNER_CLEAN_INTERVAL = [FRAMEWORK_SPAWNER_MAX_IDLE_TIME,
0
+		APP_SPAWNER_MAX_IDLE_TIME].min + 5
0
   
0
   include Utils
0
   
0
@@ -94,7 +96,7 @@ class SpawnManager < AbstractServer
0
       return spawner.spawn_application(app_root, lower_privilege,
0
         lowest_user)
0
     else
0
-			return spawner.spawn_application(app_root)
0
+			return spawner.spawn_application
0
     end
0
   end
0
   
0
@@ -212,7 +214,12 @@ private
0
           current_time = Time.now
0
           @spawners.keys.each do |key|
0
             spawner = @spawners[key]
0
-						if current_time - spawner.time > SPAWNER_MAX_IDLE_TIME
0
+						if spawner.is_a?(FrameworkSpawner)
0
+							max_idle_time = FRAMEWORK_SPAWNER_MAX_IDLE_TIME
0
+						else
0
+							max_idle_time = APP_SPAWNER_MAX_IDLE_TIME
0
+						end
0
+						if current_time - spawner.time > max_idle_time
0
               spawner.stop
0
               @spawners.delete(key)
0
             end