close opened db during shutdown (#740)

* close opened db during shutdown * refs * sort import
zopefoundation · Nov 29, 2019 · 9f297ef · 9f297ef
1 parent 6a9d18d
commit 9f297ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -9,6 +9,9 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
 5.0a1 (unreleased)
 ------------------
 
+- Close opened db during shutdown (as ZServer is already doing).
+  (`#740 <https://github.com/zopefoundation/Zope/issues/740>`_)
+
 - Updated Zope documentation sources for Zope 5
   (`#659 <https://github.com/zopefoundation/Zope/issues/659>`_)
 

diff --git a/src/Zope2/Startup/serve.py b/src/Zope2/Startup/serve.py
@@ -24,6 +24,7 @@
 from paste.deploy import loadserver
 from six.moves import configparser
 
+import Zope2
 from App.config import getConfiguration
 
 
@@ -209,6 +210,8 @@ def serve():
                     msg = ''
                 self.out('Exiting%s (-v to see traceback)' % msg)
             finally:
+                for db in Zope2.opened:
+                    db.close()
                 self.unlinkPidFile()
 
         serve()