[MERGE+FIX] fixes for translations,sequence,copy,error messages - some patches courtesy of Margarita Manterola and Don Kirkby
lp bug: https://launchpad.net/bugs/672130 fixed lp bug: https://launchpad.net/bugs/663775 fixed lp bug: https://launchpad.net/bugs/673194 fixed lp bug: https://launchpad.net/bugs/663977 fixed bzr revid: odo@openerp.com-20101130110940-0tf6ra0uwhiptieb
This commit is contained in:
+5
-1
@@ -297,7 +297,11 @@ class ConnectionPool(object):
|
||||
# note: this code is called only if the for loop has completed (no break)
|
||||
raise PoolError('The Connection Pool Is Full')
|
||||
|
||||
result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
|
||||
try:
|
||||
result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection)
|
||||
except psycopg2.Error, e:
|
||||
self.__logger.exception('Connection to the database failed')
|
||||
raise
|
||||
self._connections.append((result, True))
|
||||
self._debug('Create new connection')
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user