Bugs Fixed

----------

- ZEO server transaction timeouts weren't logged as critical.

https://bugs.launchpad.net/zodb/+bug/670986

src/CHANGES.txt

@@ -30,6 +30,10 @@ Bugs Fixed
 
   See (for example): https://bugs.launchpad.net/zodb/+bug/665452
 
+- ZEO server transaction timeouts weren't logged as critical.
+
+  https://bugs.launchpad.net/zodb/+bug/670986
+
 3.10.1 (2010-10-27)
 ===================
 

src/ZEO/StorageServer.py

@@ -1337,7 +1337,7 @@ class TimeoutThread(threading.Thread):
 
             if howlong <= 0:
                 client.log("Transaction timeout after %s seconds" %
-                           self._timeout, logging.ERROR)
+                           self._timeout, logging.CRITICAL)
                 try:
                     client.connection.call_from_thread(client.connection.close)
                 except:

src/ZEO/tests/ConnectionTests.py

@@ -994,6 +994,16 @@ class TimeoutTests(CommonSetupTearDown):
         storage.tpc_vote(txn)
         time.sleep(2)
         self.assertRaises(ClientDisconnected, storage.tpc_finish, txn)
+
+        # Make sure it's logged as CRITICAL
+        for line in open("server-%s.log" % self.addr[0][1]):
+            if (('Transaction timeout after' in line) and
+                ('CRITICAL ZEO.StorageServer' in line)
+                ):
+                break
+        else:
+            self.assert_(False, 'bad logging')
+
         storage.close()
 
     def checkTimeoutOnAbort(self):