[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 30422 from 3.4 branch.

[Tim Peters]

Log message for revision 30423:
  Merge rev 30422 from 3.4 branch.
  
  Collector 1788:  runzeo fails in 2.8
  
  A patch from Mark Hammond to repair a new Windows-specific
  gimmick in ZEOServer.setup_win32_signals().
  

Changed:
  U   ZODB/trunk/NEWS.txt
  U   ZODB/trunk/src/ZEO/runzeo.py

-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2005-05-19 19:42:47 UTC (rev 30422)
+++ ZODB/trunk/NEWS.txt	2005-05-19 19:45:54 UTC (rev 30423)
@@ -3,14 +3,15 @@
 Release date: DD-MMM-YYYY
 
 
-What's new in ZODB3 3.4a9?
+What's new in ZODB3 3.4b1?
 ==========================
-Release date: 12-May-2005
+Release date: DD-May-2005
 
 What follows is combined news from the "internal releases" (to support
 ongoing Zope 2.8 and Zope3 development) since the last public ZODB 3.4
 release.  These are the dates of the internal releases:
 
+- 3.4b1 NN-May-2005
 - 3.4a9 12-May-2005
 - 3.4a8 09-May-2005
 - 3.4a7 06-May-2005
@@ -105,6 +106,8 @@
 
 Thanks to Mark Hammond for these ``runzeo.py`` enhancements on Windows:
 
+- (3.4b1) Collector 1788:  Repair one of the new features below.
+
 - (3.4a4) A pid file (containing the process id as a decimal string) is
   created now for a ZEO server started via ``runzeo.py``.  External programs
   can read the pid from this file and derive a "signal name" used in a new

Modified: ZODB/trunk/src/ZEO/runzeo.py
===================================================================
--- ZODB/trunk/src/ZEO/runzeo.py	2005-05-19 19:42:47 UTC (rev 30422)
+++ ZODB/trunk/src/ZEO/runzeo.py	2005-05-19 19:45:54 UTC (rev 30423)
@@ -225,10 +225,8 @@
                                           windows_shutdown_handler)
             SignalHandler.registerHandler(signal.SIGINT,
                                           windows_shutdown_handler)
-            # Can use the log rotate handler too.
-            from Signals.Signals import logfileRotateHandler
             SIGUSR2 = 12 # not in signal module on Windows.
-            SignalHandler.registerHandler(SIGUSR2, logfileRotateHandler)
+            SignalHandler.registerHandler(SIGUSR2, self.handle_sigusr2)
 
     def create_server(self):
         from ZEO.StorageServer import StorageServer