[Zodb-checkins] CVS: ZODB3/ZODB - Transaction.py:1.47

[Barry Warsaw]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv1165

Modified Files:
	Transaction.py 
Log Message:
Port forward from ZODB 3.1.1 disabling the hosed state.  Added an XXX
comment describing Jim's desire to reach into ZConfig to decide
whether we should enter the hosed state or not.


=== ZODB3/ZODB/Transaction.py 1.46 => 1.47 ===
--- ZODB3/ZODB/Transaction.py:1.46	Thu Jan  2 13:05:47 2003
+++ ZODB3/ZODB/Transaction.py	Mon Jan 27 15:30:45 2003
@@ -255,7 +255,6 @@
                 # have to clean up.  First save the original exception
                 # in case the cleanup process causes another
                 # exception.
-                t, v, tb = sys.exc_info()
                 try:
                     self._commit_error(objects, ncommitted, jars, subjars)
                 except:
@@ -263,8 +262,7 @@
                         "A storage error occured during transaction "
                         "abort.  This shouldn't happen.",
                         error=sys.exc_info())
-                    
-                raise t, v, tb
+                raise
         finally:
             del objects[:] # clear registered
             if not subtransaction and self._id is not None:
@@ -356,7 +354,7 @@
             jar.tpc_finish(self)
         except:
             # Bug if it does, we need to keep track of it
-            LOG('ZODB', ERROR,
+            LOG('ZODB', PANIC,
                 "A storage error occurred in the last phase of a "
                 "two-phase commit.  This shouldn\'t happen. ",
                 error=sys.exc_info())
@@ -369,7 +367,9 @@
                 # The database can't guarantee consistency if call fails.
                 jar.tpc_finish(self)
         except:
-            hosed = 1
+            # XXX We should consult ZConfig to decide whether we want to put
+            # the transaction manager in a hosed state or not.
+            #hosed = 1
             LOG('ZODB', PANIC,
                 "A storage error occurred in the last phase of a "
                 "two-phase commit.  This shouldn\'t happen. "