diff options
| author | P. Christeas <p_christ@hol.gr> | 2008-12-15 20:27:09 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2008-12-15 20:27:09 +0200 |
| commit | bf1d0a253508d41487499821282c8238dc633242 (patch) | |
| tree | c44ca89ec2517c33e9ad991e6c3cb1da7fe6f06d /bin/sql_db.py | |
| parent | 087f5bc1710e188380ba5b8bdd1f2944c1f3d137 (diff) | |
| parent | 8deaf883c75ff71e3bee3a871df89f12dafb87b2 (diff) | |
Merge commit 'origin/master' into mdv-gpl3-fwd
bzr revid: p_christ@hol.gr-20081215182709-rusb3oq7npwecnt7
Diffstat (limited to 'bin/sql_db.py')
| -rw-r--r-- | bin/sql_db.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/sql_db.py b/bin/sql_db.py index 08b6a25da79..3f4e23cc392 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: @@ -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] |