diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-22 08:23:30 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-22 12:23:19 -0400 |
| commit | b492fd38950599f4414d0cbd8b1b03b162503aa6 (patch) | |
| tree | fcae1a99921ba51ab19fe49df0e45d5860ffb226 /src/lib | |
| parent | 77f95ece65628db007376fd0177ec701a94b4a28 (diff) | |
| download | bcfg2-b492fd38950599f4414d0cbd8b1b03b162503aa6.tar.gz bcfg2-b492fd38950599f4414d0cbd8b1b03b162503aa6.tar.bz2 bcfg2-b492fd38950599f4414d0cbd8b1b03b162503aa6.zip | |
exit gracefully when FAM startup fails
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 10 |
1 files changed, 7 insertions, 3 deletions
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() |