diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-11-10 10:32:10 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-11-10 10:32:10 -0600 |
| commit | ca78be11051dab7421a414fc3ae4104c82f1f9e7 (patch) | |
| tree | a8cabac969b171b6153c8937193eb0088d21620d | |
| parent | 9e5d720a54b51b606a7a4b6f0a1efd5905e5d2a3 (diff) | |
| download | bcfg2-ca78be11051dab7421a414fc3ae4104c82f1f9e7.tar.gz bcfg2-ca78be11051dab7421a414fc3ae4104c82f1f9e7.tar.bz2 bcfg2-ca78be11051dab7421a414fc3ae4104c82f1f9e7.zip | |
Options: further command registry fixes
This updates the documentation for some of the recent changes to
subcommand handling, and ensures that the server core is shut down by
bcfg2-info.
| -rw-r--r-- | doc/development/option_parsing.txt | 7 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Info.py | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/development/option_parsing.txt b/doc/development/option_parsing.txt index 642b9a36c..e14031e1e 100644 --- a/doc/development/option_parsing.txt +++ b/doc/development/option_parsing.txt @@ -179,8 +179,9 @@ The normal implementation pattern is this: collect its options and adds it as a :class:`Bcfg2.Options.Subparser` option group to the main option parser. -#. Register your commands with - :func:`Bcfg2.Options.register_commands`. +#. Register your commands with the + :func:`Bcfg2.Options.CommandRegistry.register_commands` method of + your ``CommandRegistry`` object. #. Add options from the :attr:`Bcfg2.Options.CommandRegistry.command_options` attribute to the option parser. @@ -211,9 +212,7 @@ At a minimum, the :func:`Bcfg2.Options.Subcommand.run` method must be overridden, and a docstring written. .. autoclass:: Subcommand -.. autoclass:: HelpCommand .. autoclass:: CommandRegistry -.. autofunction:: register_commands Actions ------- diff --git a/src/lib/Bcfg2/Server/Info.py b/src/lib/Bcfg2/Server/Info.py index da2312cc8..6af561089 100644 --- a/src/lib/Bcfg2/Server/Info.py +++ b/src/lib/Bcfg2/Server/Info.py @@ -873,3 +873,7 @@ class CLI(Bcfg2.Options.CommandRegistry): return self.runcommand() finally: self.shutdown() + + def shutdown(self): + Bcfg2.Options.CommandRegistry.shutdown(self) + self.core.shutdown() |