diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-01-03 14:18:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-01-03 14:18:36 +0000 |
| commit | 5c3a11666be7e829bf67959de77e40997c7b8ca0 (patch) | |
| tree | f295b82e370b88dce97ce4d477e5b3d723b07359 /taskflow/persistence/backends/impl_sqlalchemy.py | |
| parent | ffead3cf8f1dc57c22cc8278e01496aea53b93fc (diff) | |
| parent | f1ec7bedaf8dc6caea2df1547d892b6d645ad04c (diff) | |
| download | taskflow-5c3a11666be7e829bf67959de77e40997c7b8ca0.tar.gz | |
Merge "Raise type error instead of silencing it"
Diffstat (limited to 'taskflow/persistence/backends/impl_sqlalchemy.py')
| -rw-r--r-- | taskflow/persistence/backends/impl_sqlalchemy.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/taskflow/persistence/backends/impl_sqlalchemy.py b/taskflow/persistence/backends/impl_sqlalchemy.py index f9d9519..83b1c0d 100644 --- a/taskflow/persistence/backends/impl_sqlalchemy.py +++ b/taskflow/persistence/backends/impl_sqlalchemy.py @@ -210,11 +210,9 @@ class SQLAlchemyBackend(base.Backend): 'convert_unicode': misc.as_bool(conf.pop('convert_unicode', True)), 'pool_recycle': 3600, } - try: - idle_timeout = misc.as_int(conf.pop('idle_timeout', None)) + if 'idle_timeout' in conf: + idle_timeout = misc.as_int(conf.pop('idle_timeout')) engine_args['pool_recycle'] = idle_timeout - except TypeError: - pass sql_connection = conf.pop('connection') e_url = sa.engine.url.make_url(sql_connection) if 'sqlite' in e_url.drivername: @@ -228,10 +226,8 @@ class SQLAlchemyBackend(base.Backend): for (k, lookup_key) in [('pool_size', 'max_pool_size'), ('max_overflow', 'max_overflow'), ('pool_timeout', 'pool_timeout')]: - try: - engine_args[k] = misc.as_int(conf.pop(lookup_key, None)) - except TypeError: - pass + if lookup_key in conf: + engine_args[k] = misc.as_int(conf.pop(lookup_key)) # If the configuration dict specifies any additional engine args # or engine arg overrides make sure we merge them in. engine_args.update(conf.pop('engine_args', {})) |
