diff options
| author | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-10 15:06:04 -0400 |
|---|---|---|
| committer | Brian Lamar <brian.lamar@rackspace.com> | 2011-08-10 15:06:04 -0400 |
| commit | 8331fee7695a40824ae1bd24c52b22987b5f3507 (patch) | |
| tree | a17286e6f7edec58fcafd965bd82546a62e02074 | |
| parent | ad3ccef3e86220b480a114bb70eaa9def2abd430 (diff) | |
elif and FLAG feedback
| -rw-r--r-- | nova/db/sqlalchemy/session.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py index 7ebe000e8..81cb9fad0 100644 --- a/nova/db/sqlalchemy/session.py +++ b/nova/db/sqlalchemy/session.py @@ -70,7 +70,7 @@ def get_engine(): if "sqlite" in connection_dict.drivername: engine_args["poolclass"] = sqlalchemy.pool.NullPool - if MySQLdb and "mysql" in connection_dict.drivername: + elif MySQLdb and "mysql" in connection_dict.drivername: LOG.info(_("Using MySQLdb/eventlet DB connection pool.")) pool_args = { "db": connection_dict.database, @@ -80,7 +80,6 @@ def get_engine(): "min_size": FLAGS.sql_min_pool_size, "max_size": FLAGS.sql_max_pool_size, "max_idle": FLAGS.sql_idle_timeout, - "max_age": FLAGS.sql_idle_timeout, } creator = eventlet.db_pool.ConnectionPool(MySQLdb, **pool_args) engine_args["pool_size"] = FLAGS.sql_max_pool_size |