diff options
author | Jason Kincl <kincljc@ornl.gov> | 2013-04-17 14:40:49 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-01 08:12:39 -0400 |
commit | 3260ec92b2d9fba4b8d37559d8f6ceb49a57e4ff (patch) | |
tree | 70d76d23b42f88ab32bdc66fe360551019347ee7 /src/lib/Bcfg2 | |
parent | 139e8abff3eba4a1c6ce1a33f9835b42463583f9 (diff) | |
download | bcfg2-3260ec92b2d9fba4b8d37559d8f6ceb49a57e4ff.tar.gz bcfg2-3260ec92b2d9fba4b8d37559d8f6ceb49a57e4ff.tar.bz2 bcfg2-3260ec92b2d9fba4b8d37559d8f6ceb49a57e4ff.zip |
Adding option to force server to wait until all FAM events are processed
Diffstat (limited to 'src/lib/Bcfg2')
-rw-r--r-- | src/lib/Bcfg2/Options.py | 5 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index 55f799a29..401cb64b7 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -535,6 +535,11 @@ SERVER_FAM_IGNORE = \ 'SCCS', '.svn', '4913', '.gitignore'], cf=('server', 'ignore_files'), cook=list_split) +SERVER_FAM_BLOCK = \ + Option('FAM blocks on startup until all events are processed', + default=False, + cook=get_bool, + cf=('server', 'fam_blocking')) SERVER_LISTEN_ALL = \ Option('Listen on all interfaces', default=False, diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 59d67e566..b0197ed00 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -776,6 +776,11 @@ class BaseCore(object): self.shutdown() raise + if setup['fam_blocking']: + time.sleep(1) + while self.fam.pending() != 0: + time.sleep(1) + self.set_debug(None, self.debug_flag) self._block() |