diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-02-10 14:37:13 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-02-10 14:37:13 +0100 |
| commit | d65d2e2d34bffa2548dabcde2e230da185125026 (patch) | |
| tree | 493779de7fae3db60289d474d6d154cf06353682 | |
| parent | 3e13d005c776b99604d1b8714a79709da1e76467 (diff) | |
| download | nova-d65d2e2d34bffa2548dabcde2e230da185125026.tar.gz nova-d65d2e2d34bffa2548dabcde2e230da185125026.tar.xz nova-d65d2e2d34bffa2548dabcde2e230da185125026.zip | |
Only use NullPool when using sqlite.
| -rw-r--r-- | nova/db/sqlalchemy/session.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 5dd72dc08..4a9a28f43 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -38,10 +38,14 @@ def get_session(autocommit=True, expire_on_commit=False): global _MAKER if not _MAKER: if not _ENGINE: + kwargs = {'pool_recycle': FLAGS.sql_idle_timeout, + 'echo': False} + + if FLAGS.sql_connection.startswith('sqlite'): + kwargs['poolclass'] = pool.NullPool + _ENGINE = create_engine(FLAGS.sql_connection, - pool_recycle=FLAGS.sql_idle_timeout, - poolclass=pool.NullPool, - echo=False) + **kwargs) _MAKER = (sessionmaker(bind=_ENGINE, autocommit=autocommit, expire_on_commit=expire_on_commit)) |