[Zodb-checkins] CVS: ZODB3/ZEO - StorageServer.py:1.74.2.6.4.3

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZEO
In directory cvs.zope.org:/tmp/cvs-serv1239

Modified Files:
      Tag: ZODB3-fast-restart-branch
	StorageServer.py 
Log Message:
In two places (when calling storage methods) don't catch system exit
or ^C -- pass these exceptions through uncaught.


=== ZODB3/ZEO/StorageServer.py 1.74.2.6.4.2 => 1.74.2.6.4.3 ===
--- ZODB3/ZEO/StorageServer.py:1.74.2.6.4.2	Tue Dec 17 13:30:32 2002
+++ ZODB3/ZEO/StorageServer.py	Tue Dec 17 13:52:21 2002
@@ -590,6 +590,8 @@
         try:
             newserial = self.storage.store(oid, serial, data, version,
                                            self.txn)
+        except (SystemExit, KeyboardInterrupt):
+            raise
         except Exception, err:
             if not isinstance(err, TransactionError):
                 # Unexpected errors are logged and passed to the client
@@ -738,6 +740,8 @@
     def run(self):
         try:
             result = self._method(*self._args)
+        except (SystemExit, KeyboardInterrupt):
+            raise
         except Exception:
             self.delay.error(sys.exc_info())
         else: