From c0e1fc3452362e4479351a8be040679c879ccc02 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Mon, 15 Dec 2008 18:00:34 +0530 Subject: merginf from the trunk bzr revid: mga@tinyerp.com-20081215123034-1gnqhxeteza8e183 --- bin/sql_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/sql_db.py') diff --git a/bin/sql_db.py b/bin/sql_db.py index 08b6a25da79..335a0950c13 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -117,7 +117,7 @@ class Cursor(object): if self.sql_log: now = mdt.now() - + res = self._obj.execute(query, p or None) if self.sql_log: -- cgit v1.2.3 From 85c8b304bfbaa715c92b878c0e51d8924f012db9 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 15 Dec 2008 16:08:35 +0100 Subject: [FIX] fix a stupid bug in database closing method lp bug: https://launchpad.net/bugs/308084 fixed bzr revid: christophe@cobalt-20081215150835-d4rkvaf35m1gbyj6 --- bin/sql_db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/sql_db.py') diff --git a/bin/sql_db.py b/bin/sql_db.py index 335a0950c13..03828a1ee87 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -221,7 +221,7 @@ class PoolManager(object): get = staticmethod(get) def close(db_name): - if db_name is PoolManager._pools: + if db_name in 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] -- cgit v1.2.3 From be2a0a76bbd95ce83cc68a10ce25e5b60279a0e6 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 15 Dec 2008 16:36:16 +0100 Subject: [FIX] the database connectin pool generate at least one connection to ensure earliest that the database is reachable bzr revid: christophe@cobalt-20081215153616-dyb7xj771tzj5de1 --- bin/sql_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/sql_db.py') diff --git a/bin/sql_db.py b/bin/sql_db.py index 03828a1ee87..3f4e23cc392 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -213,9 +213,9 @@ class PoolManager(object): logger = netsvc.Logger() try: 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) + PoolManager._pools[db_name] = ConnectionPool(ThreadedConnectionPool(1, 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)) + logger.notifyChannel('dbpool', netsvc.LOG_CRITICAL, 'Unable to connect to %s: %s' % (db_name, e.message)) raise return PoolManager._pools[db_name] get = staticmethod(get) -- cgit v1.2.3