0
@@ -384,6 +384,49 @@ This option allows one to specify the Ruby interpreter to use.
0
 This option may only occur once, in the global server configuration.
0
 The default is 'ruby'.
0
 
0
+=== PassengerMaxPoolSize <integer> ===
0
+The maximum number of Ruby on Rails or Rack application instances that may
0
+be simultaneously active. A larger number results in higher memory usage,
0
+but improved ability to handle concurrent HTTP clients.
0
+
0
+The optimal value depends on your system's hardware and the server's average
0
+load. You should experiment with different values. But generally speaking,
0
+the value should be at least equal to the number of CPUs (or CPU cores) that
0
+you have. If your system has 2 GB of RAM, then we recommend a value of '30'.
0
+If your system is a Virtual Private Server (VPS) and has about 256 MB RAM, and
0
+is also running other services such as MySQL, then we recommend a value of '2'.
0
+
0
+If you find that your server is unable to handle the load on your Rails/Rack websites
0
+(i.e. running out of memory) then you should lower this value. (Though if your
0
+sites are really that popular, then you should strongly consider upgrading your
0
+hardware or getting more servers.)
0
+
0
+This option may only occur once, in the global server configuration.
0
+The default value is '6'.
0
+
0
+TIP: We strongly recommend you to <<reducing_memory_usage,use Ruby Enterprise
0
+Edition>>. This allows you to reduce the memory usage of your Ruby on Rails applications
0
+by about 33%. And it's not hard to install.
0
+
0
+=== PassengerPoolIdleTime <integer> ===
0
+The maximum number of seconds that a Ruby on Rails or Rack application instance
0
+may be idle. That is, if an application instance hasn't done anything after
0
+the given number of seconds, then it will be shutdown in order to conserve
0
+memory.
0
+
0
+Decreasing this value means that applications will have to be spawned
0
+more often. Since spawning is a relatively slow operation, some visitors may
0
+notice a small delay when they visit your Rails/Rack website. However, it will also
0
+free up resources used by applications more quickly.
0
+
0
+The optimal value depends on the average time that a visitor spends on a single
0
+Rails/Rack web page. We recommend a value of `2 * x`, where `x` is the average
0
+number of seconds that a visitor spends on a single Rails/Rack web page. But your
0
+mileage may vary.
0
+
0
+This option may only occur once, in the global server configuration.
0
+The default value is '300'.
0
+
0
 [[PassengerUserSwitching]]
0
 === PassengerUserSwitching <on|off> ===
0
 Whether to enable <<user_switching,user switching support>>.
0
@@ -506,49 +549,6 @@ render <<reducing_memory_usage,Ruby Enterprise Edition's memory reduction techno
0
 This option may occur once, in the global server configuration or in a virtual host
0
 configuration block. The default value is 'smart'.
0
 
0
-==== RailsMaxPoolSize <integer> ====
0
-The maximum number of Ruby on Rails application instances that may
0
-be simultaneously active. A larger number results in higher memory usage,
0
-but improved ability to handle concurrent HTTP clients.
0
-
0
-The optimal value depends on your system's hardware and the server's average
0
-load. You should experiment with different values. But generally speaking,
0
-the value should be at least equal to the number of CPUs (or CPU cores) that
0
-you have. If your system has 2 GB of RAM, then we recommend a value of '30'.
0
-If your system is a Virtual Private Server (VPS) and has about 256 MB RAM, and
0
-is also running other services such as MySQL, then we recommend a value of '2'.
0
-
0
-If you find that your server is unable to handle the load on your Rails websites
0
-(i.e. running out of memory) then you should lower this value. (Though if your
0
-sites are really that popular, then you should strongly consider upgrading your
0
-hardware or getting more servers.)
0
-
0
-This option may only occur once, in the global server configuration.
0
-The default value is '20'.
0
-
0
-TIP: We strongly recommend you to <<reducing_memory_usage,use Ruby Enterprise
0
-Edition>>. This allows you to reduce your memory usage by about 33%. And it's
0
-not hard to install.
0
-
0
-==== RailsPoolIdleTime <integer> ====
0
-The maximum number of seconds that a Ruby on Rails application instance
0
-may be idle. That is, if an application instance hasn't done anything after
0
-the given number of seconds, then it will be shutdown in order to conserve
0
-memory.
0
-
0
-Decreasing this value means that Rails applications will have to be spawned
0
-more often. Since spawning is a relatively slow operation, some visitors may
0
-notice a small delay when they visit your Rails site. However, it will also
0
-free up resources used by Rails applications more quickly.
0
-
0
-The optimal value depends on the average time that a visitor spends on a single
0
-Rails web page. We recommend a value of `2 * x`, where `x` is the average
0
-number of seconds that a visitor spends on a single Rails web page. But your
0
-mileage may vary.
0
-
0
-This option may only occur once, in the global server configuration.
0
-The default value is '120'.
0
-
0
 === Rack-specific options ===
0
 
0
 ==== RackAutoDetect <on|off> ====

0
@@ -25,8 +25,8 @@ using namespace Passenger;
0
 
0
 extern "C" module AP_MODULE_DECLARE_DATA passenger_module;
0
 
0
-#define DEFAULT_MAX_POOL_SIZE 20
0
-#define DEFAULT_POOL_IDLE_TIME 120
0
+#define DEFAULT_MAX_POOL_SIZE 6
0
+#define DEFAULT_POOL_IDLE_TIME 300
0
 
0
 
0
 template<typename T> static apr_status_t
0
@@ -161,6 +161,44 @@ cmd_passenger_ruby(cmd_parms *cmd, void *pcfg, const char *arg) {
0
 }
0
 
0
 static const char *
0
+cmd_passenger_max_pool_size(cmd_parms *cmd, void *pcfg, const char *arg) {
0
+	ServerConfig *config = (ServerConfig *) ap_get_module_config(
0
+		cmd->server->module_config, &passenger_module);
0
+	char *end;
0
+	long int result;
0
+	
0
+	result = strtol(arg, &end, 10);
0
+	if (*end != '\0') {
0
+		return "Invalid number specified for PassengerMaxPoolSize.";
0
+	} else if (result <= 0) {
0
+		return "Value for PassengerMaxPoolSize must be greater than 0.";
0
+	} else {
0
+		config->maxPoolSize = (unsigned int) result;
0
+		config->maxPoolSizeSpecified = true;
0
+		return NULL;
0
+	}
0
+}
0
+
0
+static const char *
0
+cmd_passenger_pool_idle_time(cmd_parms *cmd, void *pcfg, const char *arg) {
0
+	ServerConfig *config = (ServerConfig *) ap_get_module_config(
0
+		cmd->server->module_config, &passenger_module);
0
+	char *end;
0
+	long int result;
0
+	
0
+	result = strtol(arg, &end, 10);
0
+	if (*end != '\0') {
0
+		return "Invalid number specified for PassengerPoolIdleTime.";
0
+	} else if (result <= 0) {
0
+		return "Value for PassengerPoolIdleTime must be greater than 0.";
0
+	} else {
0
+		config->poolIdleTime = (unsigned int) result;
0
+		config->poolIdleTimeSpecified = true;
0
+		return NULL;
0
+	}
0
+}
0
+
0
+static const char *
0
 cmd_passenger_user_switching(cmd_parms *cmd, void *pcfg, int arg) {
0
   ServerConfig *config = (ServerConfig *) ap_get_module_config(
0
     cmd->server->module_config, &passenger_module);
0
@@ -223,44 +261,6 @@ cmd_rails_spawn_method(cmd_parms *cmd, void *pcfg, const char *arg) {
0
   return NULL;
0
 }
0
 
0
-static const char *
0
-cmd_rails_max_pool_size(cmd_parms *cmd, void *pcfg, const char *arg) {
0
-	ServerConfig *config = (ServerConfig *) ap_get_module_config(
0
-		cmd->server->module_config, &passenger_module);
0
-	char *end;
0
-	long int result;
0
-	
0
-	result = strtol(arg, &end, 10);
0
-	if (*end != '\0') {
0
-		return "Invalid number specified for RailsMaxPoolSize.";
0
-	} else if (result <= 0) {
0
-		return "Value for RailsMaxPoolSize must be greater than 0.";
0
-	} else {
0
-		config->maxPoolSize = (unsigned int) result;
0
-		config->maxPoolSizeSpecified = true;
0
-		return NULL;
0
-	}
0
-}
0
-
0
-static const char *
0
-cmd_rails_pool_idle_time(cmd_parms *cmd, void *pcfg, const char *arg) {
0
-	ServerConfig *config = (ServerConfig *) ap_get_module_config(
0
-		cmd->server->module_config, &passenger_module);
0
-	char *end;
0
-	long int result;
0
-	
0
-	result = strtol(arg, &end, 10);
0
-	if (*end != '\0') {
0
-		return "Invalid number specified for RailsPoolIdleTime.";
0
-	} else if (result <= 0) {
0
-		return "Value for RailsPoolIdleTime must be greater than 0.";
0
-	} else {
0
-		config->poolIdleTime = (unsigned int) result;
0
-		config->poolIdleTimeSpecified = true;
0
-		return NULL;
0
-	}
0
-}
0
-
0
 
0
 /*************************************************
0
  * Rack-specific settings
0
@@ -309,6 +309,16 @@ const command_rec passenger_commands[] = {
0
     NULL,
0
     RSRC_CONF,
0
     "The Ruby interpreter to use."),
0
+	AP_INIT_TAKE1("PassengerMaxPoolSize",
0
+		(Take1Func) cmd_passenger_max_pool_size,
0
+		NULL,
0
+		RSRC_CONF,
0
+		"The maximum number of simultaneously alive application instances."),
0
+	AP_INIT_TAKE1("PassengerPoolIdleTime",
0
+		(Take1Func) cmd_passenger_pool_idle_time,
0
+		NULL,
0
+		RSRC_CONF,
0
+		"The maximum number of seconds that an application may be idle before it gets terminated."),
0
   AP_INIT_FLAG("PassengerUserSwitching",
0
     (Take1Func) cmd_passenger_user_switching,
0
     NULL,
0
@@ -346,16 +356,6 @@ const command_rec passenger_commands[] = {
0
     NULL,
0
     RSRC_CONF,
0
     "The spawn method to use."),
0
-	AP_INIT_TAKE1("RailsMaxPoolSize",
0
-		(Take1Func) cmd_rails_max_pool_size,
0
-		NULL,
0
-		RSRC_CONF,
0
-		"The maximum number of simultaneously alive Rails application instances."),
0
-	AP_INIT_TAKE1("RailsPoolIdleTime",
0
-		(Take1Func) cmd_rails_pool_idle_time,
0
-		NULL,
0
-		RSRC_CONF,
0
-		"The maximum number of seconds that a Rails application may be idle before it gets terminated."),
0
   
0
   // Rack-specific settings.
0
   AP_INIT_FLAG("RackAutoDetect",
0
@@ -375,6 +375,16 @@ const command_rec passenger_commands[] = {
0
     NULL,
0
     RSRC_CONF,
0
     "Deprecated option."),
0
+	AP_INIT_TAKE1("RailsMaxPoolSize",
0
+		(Take1Func) cmd_passenger_max_pool_size,
0
+		NULL,
0
+		RSRC_CONF,
0
+		"Deprecated option."),
0
+	AP_INIT_TAKE1("RailsPoolIdleTime",
0
+		(Take1Func) cmd_passenger_pool_idle_time,
0
+		NULL,
0
+		RSRC_CONF,
0
+		"Deprecated option."),
0
   AP_INIT_FLAG("RailsUserSwitching",
0
     (Take1Func) cmd_passenger_user_switching,
0
     NULL,

0
@@ -32,7 +32,7 @@ module Passenger
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_MAX_IDLE_TIME = 120
0
+	APP_SPAWNER_MAX_IDLE_TIME = 600
0
   APP_SPAWNER_CLEAN_INTERVAL = APP_SPAWNER_MAX_IDLE_TIME + 5
0
 
0
   include Utils