Commit c86aef20 authored by Shane Hathaway's avatar Shane Hathaway

Corrected some database connection error handling.

parent 12b78388
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.36 2000/07/06 19:36:54 jim Exp $""" $Id: Connection.py,v 1.37 2000/07/12 17:37:23 shane Exp $"""
__version__='$Revision: 1.36 $'[11:-2] __version__='$Revision: 1.37 $'[11:-2]
from cPickleCache import PickleCache from cPickleCache import PickleCache
from POSException import ConflictError, ExportError from POSException import ConflictError, ExportError
...@@ -251,7 +251,8 @@ class Connection(ExportImport.ExportImport): ...@@ -251,7 +251,8 @@ class Connection(ExportImport.ExportImport):
try: f() try: f()
except: except:
f=getattr(f, 'im_self', f) f=getattr(f, 'im_self', f)
LOG('ZODB',ERROR, 'Close callback failed for %s' % f) LOG('ZODB',ERROR, 'Close callback failed for %s' % f,
error=sys.exc_info())
self.__onCloseCallbacks=() self.__onCloseCallbacks=()
def commit(self, object, transaction, _type=type, _st=type('')): def commit(self, object, transaction, _type=type, _st=type('')):
...@@ -497,7 +498,7 @@ class Connection(ExportImport.ExportImport): ...@@ -497,7 +498,7 @@ class Connection(ExportImport.ExportImport):
object._p_changed=0 object._p_changed=0
object._p_serial=serial object._p_serial=serial
except: except:
LOG('ZODB',ERROR, 'setklassstate failed', error=sys.exc_info) LOG('ZODB',ERROR, 'setklassstate failed', error=sys.exc_info())
raise raise
def tpc_abort(self, transaction): def tpc_abort(self, transaction):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment