diff options
| author | Michael Fenn <fennm@deshawresearch.com> | 2014-07-07 11:41:17 -0400 |
|---|---|---|
| committer | Michael Fenn <fennm@deshawresearch.com> | 2014-07-07 11:41:17 -0400 |
| commit | 63049a81dc0f9cbfa7fe2fca6ca875f96aad359d (patch) | |
| tree | 783033b712d70c821435bf1b9ddd11316960169d | |
| parent | a0a0a5394136d5d0c384a264244526615982fdee (diff) | |
| download | bcfg2-63049a81dc0f9cbfa7fe2fca6ca875f96aad359d.tar.gz bcfg2-63049a81dc0f9cbfa7fe2fca6ca875f96aad359d.tar.bz2 bcfg2-63049a81dc0f9cbfa7fe2fca6ca875f96aad359d.zip | |
Change fam_blocking default to True
Based on discussion in #bcfg2, the consensus seems to be that the
behavior provided by fam_blocking = True is the least surprising
of the two options (i.e. the server should not process data until
it is ready). 1.4 seems like a good time to make this change.
| -rw-r--r-- | doc/man/bcfg2.conf.txt | 2 | ||||
| -rw-r--r-- | man/bcfg2.conf.5 | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt index 36776b5cb..9e5da3eb9 100644 --- a/doc/man/bcfg2.conf.txt +++ b/doc/man/bcfg2.conf.txt @@ -49,7 +49,7 @@ fam_blocking Whether the server should block at startup until the file monitor backend has processed all events. This can cause a slower startup, but ensure that all files are recognized before the first client - is handled. + is handled. Defaults to True. ignore_files A comma-separated list of globs that should be ignored by the file diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index b9642b334..851f5527d 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -79,7 +79,7 @@ pseudo Whether the server should block at startup until the file monitor backend has processed all events. This can cause a slower startup, but ensure that all files are recognized before the first client -is handled. +is handled. Defaults to True. .TP .B ignore_files A comma\-separated list of globs that should be ignored by the file diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 544f417b4..4b2f5da0e 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -131,7 +131,7 @@ class Core(object): Bcfg2.Options.Common.repository, Bcfg2.Options.Common.filemonitor, Bcfg2.Options.BooleanOption( - cf=('server', 'fam_blocking'), default=False, + cf=('server', 'fam_blocking'), default=True, help='FAM blocks on startup until all events are processed'), Bcfg2.Options.BooleanOption( cf=('logging', 'performance'), dest="perflog", |