diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-24 21:17:28 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-10-24 21:17:28 -0500 |
commit | ae2a2bdcaebf49b631865a6aa7d29c91654e9799 (patch) | |
tree | ea534bf146c0eabc2478d823fa0afde6d84cac23 /src/lib/Bcfg2/Server | |
parent | 9678b216178b3470bb5e1b5894ae36371df84780 (diff) | |
parent | 477841f0508b6a750f7899622729a0c9fc40f07e (diff) | |
download | bcfg2-ae2a2bdcaebf49b631865a6aa7d29c91654e9799.tar.gz bcfg2-ae2a2bdcaebf49b631865a6aa7d29c91654e9799.tar.bz2 bcfg2-ae2a2bdcaebf49b631865a6aa7d29c91654e9799.zip |
Merge pull request #222 from AlexanderS/fix-keyboard-interrupt
Server/Core: also shutdown on exceptions during fam blocking
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index f60b68f45..6dfe4df1f 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -847,15 +847,15 @@ class BaseCore(object): for plug in self.plugins_by_type(Threaded): plug.start_threads() + + if self.debug_flag: + self.set_debug(None, self.debug_flag) + self.block_for_fam_events() + self._block() except: self.shutdown() raise - if self.debug_flag: - self.set_debug(None, self.debug_flag) - self.block_for_fam_events() - self._block() - def _daemonize(self): """ Daemonize the server and write the pidfile. This must be overridden by a core implementation. """ |