diff options
| author | Mantavya Gajjar <mga@tinyerp.com> | 2008-12-16 15:56:43 +0530 |
|---|---|---|
| committer | Mantavya Gajjar <mga@tinyerp.com> | 2008-12-16 15:56:43 +0530 |
| commit | e773407ee5c1f366d18aa7db10ff1d2873a530ea (patch) | |
| tree | d69ed3186e78840be22ddac190ac6769dc4528a8 /bin/sql_db.py | |
| parent | d8e954618d08c55edcd297b02dbbcede305b4739 (diff) | |
| parent | e12a46d32a6dfad0e49cd44492d3172269aeb490 (diff) | |
merging from the trunk
bzr revid: mga@tinyerp.com-20081216102643-cmvyrwi73k9bbwun
Diffstat (limited to 'bin/sql_db.py')
| -rw-r--r-- | bin/sql_db.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/sql_db.py b/bin/sql_db.py index 335a0950c13..3f4e23cc392 100644 --- a/bin/sql_db.py +++ b/bin/sql_db.py @@ -213,15 +213,15 @@ 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) 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] |