diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-17 11:50:52 -0700 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-17 11:50:52 -0700 |
commit | e1f99d1d5045e0511db42debb30aa97da2018796 (patch) | |
tree | f4c666ff57f3e87f4efded9bbc3805c9f130c70e /src/lib/Bcfg2 | |
parent | 748cf2497e2bb41d29d298a4ae08e6dfd5a05ca9 (diff) | |
parent | 52ff0fdfbd290620598e6e409723a6b269ed99af (diff) | |
download | bcfg2-e1f99d1d5045e0511db42debb30aa97da2018796.tar.gz bcfg2-e1f99d1d5045e0511db42debb30aa97da2018796.tar.bz2 bcfg2-e1f99d1d5045e0511db42debb30aa97da2018796.zip |
Merge pull request #69 from kincl/block-while-event-processing
minor fixes for FAM blocking
Diffstat (limited to 'src/lib/Bcfg2')
-rw-r--r-- | src/lib/Bcfg2/Options.py | 1 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index 1519e2603..431f1affa 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -1161,6 +1161,7 @@ SERVER_COMMON_OPTIONS = dict(repo=SERVER_REPOSITORY, password=SERVER_PASSWORD, filemonitor=SERVER_FILEMONITOR, ignore=SERVER_FAM_IGNORE, + fam_blocking=SERVER_FAM_BLOCK, location=SERVER_LOCATION, key=SERVER_KEY, cert=SERVER_CERT, diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index f2af2fa87..3eb9ff83a 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -761,7 +761,7 @@ class BaseCore(object): self.shutdown() raise - if setup['fam_blocking']: + if self.setup['fam_blocking']: time.sleep(1) while self.fam.pending() != 0: time.sleep(1) |