diff options
| author | Michael Fenn <fennm@deshawresearch.com> | 2014-07-07 15:46:55 -0400 |
|---|---|---|
| committer | Michael Fenn <fennm@deshawresearch.com> | 2014-07-07 15:47:54 -0400 |
| commit | 439ef74041e22c7ecfdbd15a41fb7336089bb0d2 (patch) | |
| tree | 86ee2860abf1dd30dad2e7ae72f23c8876e649fc | |
| parent | 63049a81dc0f9cbfa7fe2fca6ca875f96aad359d (diff) | |
| download | bcfg2-439ef74041e22c7ecfdbd15a41fb7336089bb0d2.tar.gz bcfg2-439ef74041e22c7ecfdbd15a41fb7336089bb0d2.tar.bz2 bcfg2-439ef74041e22c7ecfdbd15a41fb7336089bb0d2.zip | |
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
| -rw-r--r-- | doc/man/bcfg2-server.txt | 5 | ||||
| -rw-r--r-- | man/bcfg2-server.8 | 7 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/doc/man/bcfg2-server.txt b/doc/man/bcfg2-server.txt index 3f8f3ea21..f85964ae7 100644 --- a/doc/man/bcfg2-server.txt +++ b/doc/man/bcfg2-server.txt @@ -11,7 +11,7 @@ Synopsis **bcfg2-server** [-d] [-v] [-C *configfile*] [-D *pidfile*] [-E *encoding*] [-Q *repo path*] [-S *server url*] [-o *logfile*] [-x -*password*] [--ssl-key=\ *ssl key*] +*password*] [--ssl-key=\ *ssl key*] [--no-fam-blocking] Description ----------- @@ -33,8 +33,9 @@ Options -v Run in verbose mode. -h Print usage information. --ssl-key=key Specify the path to the SSL key. +--no-fam-blocking Synonym for fam_blocking = False in bcfg2.conf See Also -------- -:manpage:`bcfg2(1)`, :manpage:`bcfg2-lint(8)` +:manpage:`bcfg2(1)`, :manpage:`bcfg2-lint(8)`, :manpage:`bcfg2.conf(5)` 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. . diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 4b2f5da0e..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=True, + "--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", |