diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-01-25 16:48:06 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-01-25 16:48:06 +0000 |
| commit | e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92 (patch) | |
| tree | 31d523f4849b2a3232f92c2142cdd35b96beb5e1 /src/lib/Server/Plugins/Bundler.py | |
| parent | edca0b698637c3fd0a70af7e4752a46afca938d3 (diff) | |
| download | bcfg2-e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92.tar.gz bcfg2-e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92.tar.bz2 bcfg2-e3759d2a2e5fdb0e0a7f7dfa4f8244fdbb3ffe92.zip | |
Introduce the new logging infrastructure and convert the server (and bcfg2-info) over to using it
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1717 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/Bundler.py')
| -rw-r--r-- | src/lib/Server/Plugins/Bundler.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Server/Plugins/Bundler.py index cbbb6c671..59b0dead4 100644 --- a/src/lib/Server/Plugins/Bundler.py +++ b/src/lib/Server/Plugins/Bundler.py @@ -1,9 +1,7 @@ '''This provides bundle clauses with translation functionality''' __revision__ = '$Revision$' -import Bcfg2.Server.Plugin -import copy -import lxml.etree +import copy, lxml.etree, Bcfg2.Server.Plugin class Bundler(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.DirectoryBacked): '''The bundler creates dependent clauses based on the bundle/translation scheme from bcfg1''' @@ -17,7 +15,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.DirectoryBacked): try: Bcfg2.Server.Plugin.DirectoryBacked.__init__(self, self.data, self.core.fam) except OSError: - self.LogError("Failed to load Bundle repository") + self.logger.error("Failed to load Bundle repository") raise Bcfg2.Server.Plugin.PluginInitError def BuildStructures(self, metadata): @@ -25,8 +23,8 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, Bcfg2.Server.Plugin.DirectoryBacked): bundleset = [] for bundlename in metadata.bundles: if not self.entries.has_key("%s.xml"%(bundlename)): - self.LogError("Client %s requested nonexistent bundle %s" % \ - (metadata.hostname, bundlename)) + self.logger.error("Client %s requested nonexistent bundle %s" % \ + (metadata.hostname, bundlename)) continue bundle = lxml.etree.Element('Bundle', name=bundlename) [bundle.append(copy.deepcopy(item)) |