From 3017d3a7cd9cd4928a5e5247054b877e63fac095 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 11 Aug 2011 14:36:29 -0400
Subject: Silly fixes.

---
 nova/db/sqlalchemy/session.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py
index ffa3c747c..07f281938 100644
--- a/nova/db/sqlalchemy/session.py
+++ b/nova/db/sqlalchemy/session.py
@@ -65,19 +65,15 @@ def get_engine():
 
     engine_args = {
         "pool_recycle": FLAGS.sql_idle_timeout,
-        "pool_size": FLAGS.sql_max_pool_size,
-        "pool_timeout": FLAGS.sql_pool_timeout,
         "echo": False,
     }
 
     if "sqlite" in connection_dict.drivername:
-        del engine_args["pool_size"]
-        del engine_args["pool_timeout"]
         engine_args["poolclass"] = sqlalchemy.pool.NullPool
 
     elif MySQLdb and "mysql" in connection_dict.drivername:
         LOG.info(_("Using mysql/eventlet db_pool."))
-        pool_args.update({
+        pool_args = {
             "db": connection_dict.database,
             "passwd": connection_dict.password,
             "host": connection_dict.host,
@@ -85,8 +81,10 @@ def get_engine():
             "min_size": FLAGS.sql_min_pool_size,
             "max_size": FLAGS.sql_max_pool_size,
             "max_idle": FLAGS.sql_idle_timeout,
-        })
+        }
         creator = eventlet.db_pool.ConnectionPool(MySQLdb, **pool_args)
+        engine_args["pool_size"] = FLAGS.sql_max_pool_size
+        engine_args["pool_timeout"] = FLAGS.sql_pool_timeout
         engine_args["creator"] = creator.create
 
     return sqlalchemy.create_engine(FLAGS.sql_connection, **engine_args)
-- 
cgit