fail gracefully when pidfile creation fails

1 files changed, 10 insertions, 5 deletions

diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py
index 63149c15e..0fe8f39da 100644
--- a/src/lib/Bcfg2/Server/BuiltinCore.py
+++ b/src/lib/Bcfg2/Server/BuiltinCore.py
@@ -11,9 +11,9 @@ from Bcfg2.SSLServer import XMLRPCServer
 
 # pylint: disable=E0611
 try:
-    from daemon.pidfile import PIDLockFile
+    from daemon.pidfile import PIDLockFile, LockFailed
 except ImportError:
-    from daemon.pidlockfile import PIDLockFile
+    from daemon.pidlockfile import PIDLockFile, LockFailed
 # pylint: enable=E0611
 
 
@@ -80,9 +80,14 @@ class Core(BaseCore):
     def _daemonize(self):
         """ Open :attr:`context` to drop privileges, write the PID
         file, and daemonize the server core. """
-        self.context.open()
-        self.logger.info("%s daemonized" % self.name)
-        return True
+        try:
+            self.context.open()
+            self.logger.info("%s daemonized" % self.name)
+            return True
+        except LockFailed:
+            err = sys.exc_info()[1]
+            self.logger.error("Failed to daemonize %s: %s" % (self.name, err))
+            return False
 
     def _run(self):
         """ Create :attr:`server` to start the server listening. """