[Zope-Checkins] CVS: Zope - z2.py:1.56.2.4

[Chris McDonough]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv17236

Modified Files:
      Tag: chrism_logrotate_branch
	z2.py 
Log Message:
Cause debug log to be rotated as well.


=== Zope/z2.py 1.56.2.3 => 1.56.2.4 ===
 
     def closeall():
-
-        import Globals
-
         for socket in asyncore.socket_map.values():
-            socket.close()
+            try:
+                socket.close()
+            except:
+                pass
 
+        import Globals
         for db in Globals.opened:
             try:
                 db.close()
@@ -253,7 +254,6 @@
 
 
     def handler( signum, frame, die=signal.SIGTERM ):
-
         zLOG.LOG( 'z2', zLOG.INFO , "Caught signal  (%s)" % signum )
 
         if signum==die: 
@@ -261,23 +261,21 @@
             closeall()
             sys.exit(0)
 
-        # reopen log files
-
-        sys.__lg.reopen()
-        DebugLogger.reopen()
-        zLOG.LOG( 'z2', zLOG.INFO , "Logfiles reopened" )
-
-        if signum == signal.SIGUSR2: return
-        
         if signum == signal.SIGHUP: 
             zLOG.LOG( 'z2', zLOG.INFO , "Restarting")
             closeall()
             sys.exit(1)
 
-        return 
-
-
-
+        if signum == signal.SIGUSR2:
+            zLOG.LOG( 'z2', zLOG.INFO , "Reopening log files" )
+            sys.__lg.reopen()
+            zLOG.LOG('z2', zLOG.BLATHER, "Reopened Z2.log")
+            if hasattr(sys, '__detailedlog'):
+                zLOG.LOG('z2', zLOG.BLATHER, "Reopened detailed request log")
+                sys.__detailedlog.reopen()
+            zLOG._set_log_dest(None)
+            zLOG.LOG('z2', zLOG.BLATHER, "Reopened debug log")
+        
     def installhandler():
         signal.signal( signal.SIGHUP, handler )
         signal.signal( signal.SIGTERM, handler )
@@ -527,7 +525,7 @@
     import zdaemon, App.FindHomes, posix
     sys.ZMANAGED=1
 
-#    zdaemon.run(sys.argv, os.path.join(CLIENT_HOME, Zpid))
+    zdaemon.run(sys.argv, os.path.join(CLIENT_HOME, Zpid))
 
 try:
     # Import logging support
@@ -545,10 +543,12 @@
     if DETAILED_LOG_FILE:
         from ZServer import DebugLogger
         logfile=os.path.join(CLIENT_HOME, DETAILED_LOG_FILE)
+        zLOG.LOG('z2', zLOG.INFO,
+                 'Using detailed request log file %s' % logfile)
         DL=DebugLogger.DebugLogger(logfile)
         DebugLogger.log=DL.log
         DebugLogger.reopen=DL.reopen
-
+        sys.__detailedlog=DL
     # Import Zope (or Main)
     exec "import "+MODULE in {}