From c0152f5fcf0cd3c995bbdb0979801bc0abbe1af6 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 11 Dec 2008 12:22:48 +0100 Subject: [FIX] If an error occurs when dropping the database, raise a normal exception (that can be pickle) lp bug: https://launchpad.net/bugs/307069 fixed bzr revid: christophe@tinyerp.com-20081211112248-ljibz77ey2jkjtjd --- bin/sql_db.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/sql_db.py') diff --git a/bin/sql_db.py b/bin/sql_db.py index ccf57d0c718..4286a98da2f 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -176,7 +176,7 @@ class PoolManager(object): if db_name not in PoolManager._pools: logger = netsvc.Logger() try: - logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Connecting to %s' % (db_name.lower())) + logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Connecting to %s' % (db_name,)) PoolManager._pools[db_name] = ConnectionPool(ThreadedConnectionPool(0, PoolManager.maxconn, PoolManager.dsn(db_name)), db_name) except Exception, e: logger.notifyChannel('dbpool', netsvc.LOG_CRITICAL, 'Unable to connect to %s: %r' % (db_name, e)) @@ -186,6 +186,7 @@ class PoolManager(object): def close(db_name): if db_name is PoolManager._pools: + logger.notifyChannel('dbpool', netsvc.LOG_INFO, 'Closing all connections to %s' % (db_name,)) PoolManager._pools[db_name].closeall() del PoolManager._pools[db_name] close = staticmethod(close) -- cgit v1.2.3