[Zope-Checkins] SVN: Zope/branches/2.13/ Cleanup lock and pid files if the process dies early in startup.

[Ross Patterson]

Log message for revision 126494:
  Cleanup lock and pid files if the process dies early in startup.
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/Zope2/Startup/run.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.13/doc/CHANGES.rst	2012-05-24 18:19:54 UTC (rev 126493)
+++ Zope/branches/2.13/doc/CHANGES.rst	2012-05-24 21:16:41 UTC (rev 126494)
@@ -8,6 +8,8 @@
 2.13.14 (unreleased)
 --------------------
 
+- Cleanup lock and pid files if the process dies early in startup.
+
 - Added PubStart, PubBeforeCommit and PubAfterTraversal events to the
   WSGI publisher.
 

Modified: Zope/branches/2.13/src/Zope2/Startup/run.py
===================================================================
--- Zope/branches/2.13/src/Zope2/Startup/run.py	2012-05-24 18:19:54 UTC (rev 126493)
+++ Zope/branches/2.13/src/Zope2/Startup/run.py	2012-05-24 21:16:41 UTC (rev 126494)
@@ -18,8 +18,11 @@
     starter = Zope2.Startup.get_starter()
     opts = _setconfig()
     starter.setConfiguration(opts.configroot)
-    starter.prepare()
-    starter.run()
+    try:
+        starter.prepare()
+        starter.run()
+    finally:
+        starter.shutdown()
 
 def configure(configfile):
     """ Provide an API which allows scripts like zopectl to configure