From 63049a81dc0f9cbfa7fe2fca6ca875f96aad359d Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Mon, 7 Jul 2014 11:41:17 -0400 Subject: 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. --- man/bcfg2.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') 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 -- cgit v1.2.3-1-g7c22 From 439ef74041e22c7ecfdbd15a41fb7336089bb0d2 Mon Sep 17 00:00:00 2001 From: Michael Fenn Date: Mon, 7 Jul 2014 15:46:55 -0400 Subject: Add a --no-fam-blocking command-line argument to bcfg2-server There is a quirk in the configuration parser where a BooleanOption with default=True will always return false __unless_ a command-line option is provided. Not sure why that's the case, but this is a work- around --- man/bcfg2-server.8 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'man') diff --git a/man/bcfg2-server.8 b/man/bcfg2-server.8 index dcec03252..60fe58a30 100644 --- a/man/bcfg2-server.8 +++ b/man/bcfg2-server.8 @@ -34,7 +34,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]] .sp \fBbcfg2\-server\fP [\-d] [\-v] [\-C \fIconfigfile\fP] [\-D \fIpidfile\fP] [\-E \fIencoding\fP] [\-Q \fIrepo path\fP] [\-S \fIserver url\fP] [\-o \fIlogfile\fP] [\-x -\fIpassword\fP] [\-\-ssl\-key=\fIssl key\fP] +\fIpassword\fP] [\-\-ssl\-key=\fIssl key\fP] [\-\-no\-fam\-blocking] .SH DESCRIPTION .sp \fBbcfg2\-server\fP is the daemon component of Bcfg2 which serves @@ -70,9 +70,12 @@ Print usage information. .TP .BI \-\-ssl\-key\fB= key Specify the path to the SSL key. +.TP +.BI \-\-no\-fam\-blocking +Synonym for fam_blocking = False in bcfg2.conf .UNINDENT .SH SEE ALSO .sp -\fIbcfg2(1)\fP, \fIbcfg2\-lint(8)\fP +\fIbcfg2(1)\fP, \fIbcfg2\-lint(8)\fP, \fIbcfg2.conf(5)\fP .\" Generated by docutils manpage writer. . -- cgit v1.2.3-1-g7c22