Explicitly close all databases on shutdown, which ensures `Data.fs.index` gets...

Explicitly close all databases on shutdown, which ensures `Data.fs.index` gets written to the file system.

doc/CHANGES.rst

@@ -16,6 +16,9 @@ Bugs Fixed
 Features Added
 ++++++++++++++
 
+- Explicitly close all databases on shutdown, which ensures `Data.fs.index`
+  gets written to the file system.
+
 - Always configure a `blob-dir` in the default skeleton.
 
 - ZPublisher: If `IBrowserPage` is provided by a view, form input is decoded.

src/Zope2/App/startup.py

@@ -76,7 +76,7 @@ def startup():
             m=imp.find_module('custom_zodb',[configuration.testinghome])
         except:
             m=imp.find_module('custom_zodb',[configuration.instancehome])
-    except:
+    except Exception:
         # if there is no custom_zodb, use the config file specified databases
         DB = dbtab.getDatabase('/', is_root=1)
     else:

src/Zope2/Startup/__init__.py

@@ -107,6 +107,9 @@ class ZopeStarter:
             self.shutdown()
 
     def shutdown(self):
+        databases = getattr(self.cfg.dbtab, 'databases', {})
+        for db in databases.values():
+            db.close()
         self.unlinkLockFile()
         self.unlinkPidFile()