From 9c5aa1949b80c3fe96535ca82bee6f6c9b2d9248 Mon Sep 17 00:00:00 2001 From: Jason Kincl Date: Wed, 17 Apr 2013 14:49:19 -0400 Subject: minor fixes for FAM blocking --- src/lib/Bcfg2/Options.py | 1 + src/lib/Bcfg2/Server/Core.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3-1-g7c22