From b492fd38950599f4414d0cbd8b1b03b162503aa6 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 22 Oct 2012 08:23:30 -0400 Subject: exit gracefully when FAM startup fails --- src/lib/Bcfg2/Server/Core.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/lib/Bcfg2') diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index ee8c34fb8..0a4489bb9 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -667,9 +667,13 @@ class BaseCore(object): self.shutdown() return False - self.fam.start() - self.fam_thread.start() - self.fam.AddMonitor(self.cfile, self) + try: + self.fam.start() + self.fam_thread.start() + self.fam.AddMonitor(self.cfile, self) + except: + self.shutdown() + raise self._block() -- cgit v1.2.3-1-g7c22