Fix lock file cleanup if there's an error early in startup.

zopefoundation · Jun 8, 2012 · 28213fd · 28213fd
1 parent 2a58c32
commit 28213fd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/doc/CHANGES.rst b/doc/CHANGES.rst
@@ -8,6 +8,8 @@ http://docs.zope.org/zope2/releases/.
 2.13.15 (unreleased)
 --------------------
 
+- Fix lock file cleanup if there's an error early in startup.
+
 
 2.13.14 (2012-05-31)
 --------------------

diff --git a/src/Zope2/Startup/__init__.py b/src/Zope2/Startup/__init__.py
@@ -303,7 +303,7 @@ def unlinkPidFile(self):
                 pass
 
     def unlinkLockFile(self):
-        if not self.cfg.zserver_read_only_mode:
+        if not self.cfg.zserver_read_only_mode and hasattr(self, 'lockfile'):
             try:
                 self.lockfile.close()
                 os.unlink(self.cfg.lock_filename)

diff --git a/src/Zope2/Startup/run.py b/src/Zope2/Startup/run.py
@@ -20,8 +20,9 @@ def run():
     starter.setConfiguration(opts.configroot)
     try:
         starter.prepare()
-    finally:
+    except:
         starter.shutdown()
+        raise
     starter.run()
 
 def configure(configfile):