diff options
| author | Jason Kincl <kincljc@ornl.gov> | 2013-04-17 14:49:19 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-01 08:12:39 -0400 |
| commit | 9c5aa1949b80c3fe96535ca82bee6f6c9b2d9248 (patch) | |
| tree | 03fd5387ca8ce37403e3a55e721b47700f0a3ef7 | |
| parent | 3260ec92b2d9fba4b8d37559d8f6ceb49a57e4ff (diff) | |
| download | bcfg2-9c5aa1949b80c3fe96535ca82bee6f6c9b2d9248.tar.gz bcfg2-9c5aa1949b80c3fe96535ca82bee6f6c9b2d9248.tar.bz2 bcfg2-9c5aa1949b80c3fe96535ca82bee6f6c9b2d9248.zip | |
minor fixes for FAM blocking
| -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 401cb64b7..c7604c5c4 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -1171,6 +1171,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 b0197ed00..ab8cda3da 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -776,7 +776,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) |