summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
authorJason Kincl <kincljc@ornl.gov>2013-04-17 14:40:49 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-05-01 08:12:39 -0400
commit3260ec92b2d9fba4b8d37559d8f6ceb49a57e4ff (patch)
tree70d76d23b42f88ab32bdc66fe360551019347ee7 /src/lib/Bcfg2/Server/Core.py
parent139e8abff3eba4a1c6ce1a33f9835b42463583f9 (diff)
downloadbcfg2-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/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py5
1 files changed, 5 insertions, 0 deletions
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()