Merge branch 'stable-2.6'

* stable-2.6:
  Add documentation for database.connectionPool setting
This commit is contained in:
Shawn Pearce
2013-05-06 10:00:44 -07:00

View File

@@ -1049,6 +1049,13 @@ database.type or database.url for any supported database.
isn't necessary as it can be constructed from the all of the isn't necessary as it can be constructed from the all of the
above properties. above properties.
[[database.connectionPool]]database.connectionPool::
+
If true, use connection pooling for database connections. Otherwise, a
new database connection is opened for each request.
+
Default is false for MySQL, and true for other database backends.
[[database.poolLimit]]database.poolLimit:: [[database.poolLimit]]database.poolLimit::
+ +
Maximum number of open database connections. If the server needs Maximum number of open database connections. If the server needs
@@ -1060,11 +1067,17 @@ httpd and sshd threads as some request processing code paths may
need multiple connections. need multiple connections.
+ +
Default is 8. Default is 8.
+
This setting only applies if
<<database.connectionPool,database.connectionPool>> is true.
[[database.poolMinIdle]]database.poolMinIdle:: [[database.poolMinIdle]]database.poolMinIdle::
+ +
Minimum number of connections to keep idle in the pool. Minimum number of connections to keep idle in the pool.
Default is 4. Default is 4.
+
This setting only applies if
<<database.connectionPool,database.connectionPool>> is true.
[[database.poolMaxIdle]]database.poolMaxIdle:: [[database.poolMaxIdle]]database.poolMaxIdle::
+ +
@@ -1072,6 +1085,9 @@ Maximum number of connections to keep idle in the pool. If there
are more idle connections, connections will be closed instead of are more idle connections, connections will be closed instead of
being returned back to the pool. being returned back to the pool.
Default is 4. Default is 4.
+
This setting only applies if
<<database.connectionPool,database.connectionPool>> is true.
[[database.poolMaxWait]]database.poolMaxWait:: [[database.poolMaxWait]]database.poolMaxWait::
+ +
@@ -1090,6 +1106,9 @@ Values should use common unit suffixes to express their setting:
If a unit suffix is not specified, `milliseconds` is assumed. If a unit suffix is not specified, `milliseconds` is assumed.
+ +
Default is `30 seconds`. Default is `30 seconds`.
+
This setting only applies if
<<database.connectionPool,database.connectionPool>> is true.
[[download]]Section download [[download]]Section download
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~