From f76ee4bae4d8a45cc2050b8219cdf7f2e8c6533d Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 4 Mar 2014 07:46:46 -0500
Subject: bcfg2-report-collector: better error messages when failing to
 daemonize

---
 src/lib/Bcfg2/Reporting/Collector.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Reporting/Collector.py b/src/lib/Bcfg2/Reporting/Collector.py
index 2859eca28..8ca145f16 100644
--- a/src/lib/Bcfg2/Reporting/Collector.py
+++ b/src/lib/Bcfg2/Reporting/Collector.py
@@ -1,3 +1,4 @@
+import sys
 import atexit
 import daemon
 import logging
@@ -6,6 +7,7 @@ import traceback
 import threading
 
 # pylint: disable=E0611
+from lockfile import LockFailed, LockTimeout
 try:
     from lockfile.pidlockfile import PIDLockFile
     from lockfile import Error as PIDFileError
@@ -119,6 +121,17 @@ class ReportingCollector(object):
             try:
                 self.context.pidfile = PIDLockFile(self.setup['daemon'])
                 self.context.open()
+            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" %
                     traceback.format_exc().splitlines()[-1])
-- 
cgit v1.2.3-1-g7c22