summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-07-15 10:54:55 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-07-15 10:54:55 -0400
commit16bb58a7110daeb479fdf41e5c67f45dc3502fc5 (patch)
treee2d4da726b6ed0a37187d57d5d9367bc30a4d33b /src/lib/Bcfg2/Server/Core.py
parent1f3f4c79fb4bb0684a000c169774c7b62816ff5a (diff)
parentc76fb188215208fcfc5af9027f16447855a6f064 (diff)
downloadbcfg2-16bb58a7110daeb479fdf41e5c67f45dc3502fc5.tar.gz
bcfg2-16bb58a7110daeb479fdf41e5c67f45dc3502fc5.tar.bz2
bcfg2-16bb58a7110daeb479fdf41e5c67f45dc3502fc5.zip
Merge pull request #180 from fennm/default-fam_blocking-to-true
Default fam blocking to true
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 544f417b4..a2f9499f2 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -131,7 +131,8 @@ class Core(object):
Bcfg2.Options.Common.repository,
Bcfg2.Options.Common.filemonitor,
Bcfg2.Options.BooleanOption(
- cf=('server', 'fam_blocking'), default=False,
+ "--no-fam-blocking", cf=('server', 'fam_blocking'),
+ dest="fam_blocking", default=True,
help='FAM blocks on startup until all events are processed'),
Bcfg2.Options.BooleanOption(
cf=('logging', 'performance'), dest="perflog",