Merged remaining changes from toby-clean-shutdown-branch. This resolves the...

Merged remaining changes from toby-clean-shutdown-branch. This resolves the overnight problem where storages were not closed if Zope is shut down using the ZMI, and the long-standing problem where storages were closed too soon when shut down using a signal

lib/python/App/ApplicationManager.py

@@ -11,8 +11,8 @@
 #
 ##############################################################################
 __doc__="""System management components"""
-__version__='$Revision: 1.84 $'[11:-2]
 
+__version__='$Revision: 1.85 $'[11:-2]
 
 import sys,os,time,Globals, Acquisition, os, Undo
 from Globals import DTMLFile

z2.py

@@ -909,5 +909,11 @@ sys.ZServerExitCode=0
 import Lifetime
 Lifetime.loop()
 code = sys.ZServerExitCode
+
+zLOG.LOG('z2', zLOG.INFO, "Closing all open ZODB databases")
+import Globals
+for db in Globals.opened:
+    db.close()
+
 zLOG.LOG("z2", zLOG.INFO, 'Exiting with code %d' % code )
 sys.exit(code)