diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2014-10-23 13:44:09 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2014-10-23 13:44:09 -0500 |
commit | 9678b216178b3470bb5e1b5894ae36371df84780 (patch) | |
tree | f7431d38c1c5a3b29c672d8c603120256b5bc9e7 /src/lib/Bcfg2/Server | |
parent | 82db7888a6370233ce29cbcc27c16053b662e16c (diff) | |
parent | d1b630dc6edb77f248c2c5bcaddf7526210a55da (diff) | |
download | bcfg2-9678b216178b3470bb5e1b5894ae36371df84780.tar.gz bcfg2-9678b216178b3470bb5e1b5894ae36371df84780.tar.bz2 bcfg2-9678b216178b3470bb5e1b5894ae36371df84780.zip |
Merge branch 'cleanup_pidfile' of https://github.com/mattikus/bcfg2 into maint
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r-- | src/lib/Bcfg2/Server/BuiltinCore.py | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py index 93da767c7..29beb35d5 100644 --- a/src/lib/Bcfg2/Server/BuiltinCore.py +++ b/src/lib/Bcfg2/Server/BuiltinCore.py @@ -1,5 +1,6 @@ """ The core of the builtin Bcfg2 server. """ +import os import sys import time import socket @@ -83,19 +84,30 @@ class Core(BaseCore): def _daemonize(self): """ Open :attr:`context` to drop privileges, write the PID file, and daemonize the server core. """ + # Attempt to ensure lockfile is able to be created and not stale try: - self.context.open() - self.logger.info("%s daemonized" % self.name) - return True + self.context.pidfile.acquire() except LockFailed: err = sys.exc_info()[1] self.logger.error("Failed to daemonize %s: %s" % (self.name, err)) return False except LockTimeout: - err = sys.exc_info()[1] - self.logger.error("Failed to daemonize %s: Failed to acquire lock " - "on %s" % (self.name, self.setup['daemon'])) - return False + try: # attempt to break the lock + os.kill(self.context.pidfile.read_pid(), 0) + except (OSError, TypeError): # No process with locked PID + self.context.pidfile.break_lock() + else: + err = sys.exc_info()[1] + self.logger.error("Failed to daemonize %s: Failed to acquire" + "lock on %s" % (self.name, + self.setup['daemon'])) + return False + else: + self.context.pidfile.release() + + self.context.open() + self.logger.info("%s daemonized" % self.name) + return True def _run(self): """ Create :attr:`server` to start the server listening. """ |