Merge branch 'maint'

Conflicts:
	debian/changelog
	doc/conf.py
	doc/releases/index.txt
	doc/server/database.txt
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/sslca.txt
	man/bcfg2.conf.5
	misc/bcfg2-selinux.spec
	misc/bcfg2.spec
	osx/Makefile
	osx/macports/Portfile
	schemas/packages.xsd
	solaris-ips/MANIFEST.bcfg2-server.header
	solaris-ips/MANIFEST.bcfg2.header
	solaris-ips/Makefile
	solaris-ips/pkginfo.bcfg2
	solaris-ips/pkginfo.bcfg2-server
	solaris/Makefile
	solaris/pkginfo.bcfg2
	solaris/pkginfo.bcfg2-server
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Client/Tools/APT.py
	src/lib/Bcfg2/Client/Tools/Action.py
	src/lib/Bcfg2/Client/Tools/SYSV.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Reporting/Collector.py
	src/lib/Bcfg2/Reporting/templates/base.html
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
	src/lib/Bcfg2/Server/Plugins/Probes.py
	src/lib/Bcfg2/settings.py
	src/lib/Bcfg2/version.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 22 insertions, 16 deletions

diff --git a/src/lib/Bcfg2/Reporting/Collector.py b/src/lib/Bcfg2/Reporting/Collector.py
index e29bd5a99..153809a35 100644
--- a/src/lib/Bcfg2/Reporting/Collector.py
+++ b/src/lib/Bcfg2/Reporting/Collector.py
@@ -1,3 +1,4 @@
+import os
 import sys
 import atexit
 import daemon
@@ -5,13 +6,12 @@ import logging
 import time
 import threading
 
-# pylint: disable=E0611
 from lockfile import LockFailed, LockTimeout
+# pylint: disable=E0611
 try:
-    from lockfile.pidlockfile import PIDLockFile
-    from lockfile import Error as PIDFileError
+    from daemon.pidfile import TimeoutPIDLockFile
 except ImportError:
-    from daemon.pidlockfile import PIDLockFile, PIDFileError
+    from daemon.pidlockfile import TimeoutPIDLockFile
 # pylint: enable=E0611
 
 import Bcfg2.Logger
@@ -129,25 +129,31 @@ class ReportingCollector(object):
 
         if Bcfg2.Options.setup.daemon:
             self.logger.debug("Daemonizing")
+            self.context.pidfile = TimeoutPIDLockFile(
+                Bcfg2.Options.setup.daemon, acquire_timeout=5)
+            # Attempt to ensure lockfile is able to be created and not stale
             try:
-                self.context.pidfile = PIDLockFile(Bcfg2.Options.setup.daemon)
-                self.context.open()
+                self.context.pidfile.acquire()
             except LockFailed:
                 self.logger.error("Failed to daemonize: %s" %
                                   sys.exc_info()[1])
                 self.shutdown()
                 return
             except LockTimeout:
-                self.logger.error("Failed to daemonize: "
-                                  "Failed to acquire lock on %s" %
-                                  self.setup['daemon'])
-                self.shutdown()
-                return
-            except PIDFileError:
-                self.logger.error("Error writing pid file: %s" %
-                                  sys.exc_info()[1])
-                self.shutdown()
-                return
+                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:
+                    self.logger.error("Failed to daemonize: "
+                                      "Failed to acquire lock on %s" %
+                                      Bcfg2.Options.setup.daemon)
+                    self.shutdown()
+                    return
+            else:
+                self.context.pidfile.release()
+
+            self.context.open()
             self.logger.info("Starting daemon")
 
         self.transport.start_monitor(self)