openstack
/
oslo-incubator
Code Issues Proposed changes

Merge "db.sqlalchemy.session add [sql].idle_timeout"

This commit is contained in:
Jenkins 2013-12-11 04:01:54 +00:00 committed by Gerrit Code Review
parent 0a348c9f43 915f8ab597
commit 15ea4ffdbc
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/common/db/sqlalchemy/session.py
View File

@ -289,7 +289,9 @@ database_opts = [
deprecated_opts=[cfg.DeprecatedOpt('sql_idle_timeout', deprecated_opts=[cfg.DeprecatedOpt('sql_idle_timeout',
group='DEFAULT'), group='DEFAULT'),
cfg.DeprecatedOpt('sql_idle_timeout', cfg.DeprecatedOpt('sql_idle_timeout',
group='DATABASE')], group='DATABASE'),
cfg.DeprecatedOpt('idle_timeout',
group='sql')],
help='timeout before idle sql connections are reaped'), help='timeout before idle sql connections are reaped'),
cfg.IntOpt('min_pool_size', cfg.IntOpt('min_pool_size',
default=1, default=1,

4
tests/unit/db/sqlalchemy/test_sqlalchemy.py
View File

@ -111,12 +111,14 @@ pool_timeout=7
self.assertEqual(self.conf.database.max_overflow, 101) self.assertEqual(self.conf.database.max_overflow, 101)
self.assertEqual(self.conf.database.pool_timeout, 5) self.assertEqual(self.conf.database.pool_timeout, 5)
def test_dbapi_database_deprecated_parameters_sql_connection(self): def test_dbapi_database_deprecated_parameters_sql(self):
path = self.create_tempfiles([['tmp', '[sql]\n' path = self.create_tempfiles([['tmp', '[sql]\n'
'connection=test_sql_connection\n' 'connection=test_sql_connection\n'
'idle_timeout=99\n'
]])[0] ]])[0]
self.conf(['--config-file', path]) self.conf(['--config-file', path])
self.assertEqual(self.conf.database.connection, 'test_sql_connection') self.assertEqual(self.conf.database.connection, 'test_sql_connection')
self.assertEqual(self.conf.database.idle_timeout, 99)
class SessionErrorWrapperTestCase(test_base.DbTestCase): class SessionErrorWrapperTestCase(test_base.DbTestCase):