From b121cd266d3d5e1719e644d6bd82d6402f13d2e2 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 11 Aug 2011 11:55:02 -0400
Subject: Logging for SQLAlchemy type.

---
 nova/db/sqlalchemy/session.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nova/db/sqlalchemy/session.py b/nova/db/sqlalchemy/session.py
index 07ca27bab..073e4ae49 100644
--- a/nova/db/sqlalchemy/session.py
+++ b/nova/db/sqlalchemy/session.py
@@ -77,10 +77,8 @@ def get_engine():
     }
 
     pool_args = {
-        "db": connection_dict.database,
-        "user": connection_dict.username,
-        "passwd": connection_dict.password,
         "host": connection_dict.host,
+        "user": connection_dict.username,
         "min_size": FLAGS.sql_min_pool_size,
         "max_size": FLAGS.sql_max_pool_size,
         "max_idle": FLAGS.sql_idle_timeout,
@@ -92,10 +90,20 @@ def get_engine():
         engine_args["poolclass"] = sqlalchemy.pool.NullPool
 
     elif MySQLdb and "mysql" in connection_dict.drivername:
+        LOG.info(_("Using mysql/eventlet db_pool."))
+        pool_args.update({
+            "db": connection_dict.database,
+            "passwd": connection_dict.password,
+        })
         creator = eventlet.db_pool.ConnectionPool(MySQLdb, **pool_args)
         engine_args["creator"] = creator.create
 
     elif psycopg2 and "postgresql" in connection_dict.drivername:
+        LOG.info(_("Using postgresql/eventlet db_pool."))
+        pool_args.update({
+            "database": connection_dict.database,
+            "password": connection_dict.password,
+        })
         creator = eventlet.db_pool.ConnectionPool(psycopg2, **pool_args)
         engine_args["creator"] = creator.create
 
-- 
cgit