diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-05-07 02:49:36 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-05-07 02:49:36 +0000 |
| commit | 5fa6d2ca71a222145d47f3b21210bae7b5cd20e5 (patch) | |
| tree | e7cd301df1f5ab07ee8cc1604ef9e67f278cbb5f /src | |
| parent | 6d30d587c9b9877d88dc1dfd36bddb91a02bf018 (diff) | |
| download | bcfg2-5fa6d2ca71a222145d47f3b21210bae7b5cd20e5.tar.gz bcfg2-5fa6d2ca71a222145d47f3b21210bae7b5cd20e5.tar.bz2 bcfg2-5fa6d2ca71a222145d47f3b21210bae7b5cd20e5.zip | |
Implement reporting for deprecated plugins, improve reporting for experimental plugins
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5207 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Core.py | 17 | ||||
| -rw-r--r-- | src/lib/Server/Plugin.py | 1 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Svcmgr.py | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 6a9a6b47f..636542bf2 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -48,7 +48,19 @@ class Core(object): for plugin in plugins: if not plugin in self.plugins: - self.init_plugins(plugin) + self.init_plugins(plugin) + expl = [plug for (name, plug) in self.plugins.iteritems() + if plug.experimental] + if expl: + logger.info("Loading experimental plugin(s): %s" % \ + (" ".join([x.name for x in expl]))) + logger.info("NOTE: Interfaces subject to change") + depr = [plug for (name, plug) in self.plugins.iteritems() + if plug.deprecated] + if depr: + logger.info("Loading deprecated plugin(s): %s" % \ + (" ".join([x.name for x in depr]))) + mlist = [p for p in self.plugins.values() if \ isinstance(p, Bcfg2.Server.Plugin.Metadata)] @@ -78,9 +90,6 @@ class Core(object): logger.error("Failed to load plugin %s" % (plugin)) return plug = getattr(mod, plugin) - if plug.experimental: - logger.info("Loading experimental plugin %s" % (plugin)) - logger.info("NOTE: Interface subject to change") try: self.plugins[plugin] = plug(self, self.datastore) except PluginInitError: diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 353215d12..c5cf80fa4 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -40,6 +40,7 @@ class Plugin(object): __author__ = 'bcfg-dev@mcs.anl.gov' __rmi__ = [] experimental = False + deprecated = False def __init__(self, core, datastore): object.__init__(self) diff --git a/src/lib/Server/Plugins/Svcmgr.py b/src/lib/Server/Plugins/Svcmgr.py index 770871c18..ab951be35 100644 --- a/src/lib/Server/Plugins/Svcmgr.py +++ b/src/lib/Server/Plugins/Svcmgr.py @@ -8,3 +8,4 @@ class Svcmgr(Bcfg2.Server.Plugin.PrioDir): name = 'Svcmgr' __version__ = '$Id$' __author__ = 'bcfg-dev@mcs.anl.gov' + deprecated = True |