diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-23 12:54:00 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-23 12:59:06 -0500 |
commit | fa0cd53c5271ebffebad4e1fa275193088c4dc78 (patch) | |
tree | 597328a128e9defdbf6f3e19b072280eafe5d277 /src/lib/Server/Plugins/Packages/PackagesSources.py | |
parent | 4f91f12e58b19cca1164b5510dd211574e441f24 (diff) | |
download | bcfg2-fa0cd53c5271ebffebad4e1fa275193088c4dc78.tar.gz bcfg2-fa0cd53c5271ebffebad4e1fa275193088c4dc78.tar.bz2 bcfg2-fa0cd53c5271ebffebad4e1fa275193088c4dc78.zip |
added toggle_debug back to Packages (#1091)
Diffstat (limited to 'src/lib/Server/Plugins/Packages/PackagesSources.py')
-rw-r--r-- | src/lib/Server/Plugins/Packages/PackagesSources.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/lib/Server/Plugins/Packages/PackagesSources.py b/src/lib/Server/Plugins/Packages/PackagesSources.py index 4fbccab30..35759879d 100644 --- a/src/lib/Server/Plugins/Packages/PackagesSources.py +++ b/src/lib/Server/Plugins/Packages/PackagesSources.py @@ -1,17 +1,16 @@ import os import sys import lxml.etree -import logging import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Packages.Source import SourceInitError -logger = logging.getLogger("Packages") - class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, - Bcfg2.Server.Plugin.StructFile): + Bcfg2.Server.Plugin.StructFile, + Bcfg2.Server.Plugin.Debuggable): __identifier__ = None def __init__(self, filename, cachepath, fam, packages, config): + Bcfg2.Server.Plugin.Debuggable.__init__(self) try: Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self, filename, @@ -21,7 +20,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, msg = "Packages: Failed to read configuration file: %s" % err if not os.path.exists(self.name): msg += " Have you created it?" - logger.error(msg) + self.logger.error(msg) raise Bcfg2.Server.Plugin.PluginInitError(msg) Bcfg2.Server.Plugin.StructFile.__init__(self, filename) self.cachepath = cachepath @@ -33,13 +32,18 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, self.parsed = set() self.loaded = False + def toggle_debug(self): + Bcfg2.Server.Plugin.Debuggable.toggle_debug(self) + for source in self.entries: + source.toggle_debug() + def HandleEvent(self, event=None): Bcfg2.Server.Plugin.SingleXMLFileBacked.HandleEvent(self, event=event) if event.filename != self.name: self.parsed.add(os.path.basename(event.filename)) if sorted(list(self.parsed)) == sorted(self.extras): - logger.info("Reloading Packages plugin") + self.logger.info("Reloading Packages plugin") self.pkg_obj.Reload() self.loaded = True @@ -56,7 +60,8 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, sources.xml """ stype = xsource.get("type") if stype is None: - logger.error("Packages: No type specified for source, skipping") + self.logger.error("Packages: No type specified for source, " + "skipping") return None try: @@ -65,14 +70,14 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, stype.title()) cls = getattr(module, "%sSource" % stype.title()) except (ImportError, AttributeError): - logger.error("Packages: Unknown source type %s" % stype) + self.logger.error("Packages: Unknown source type %s" % stype) return None try: source = cls(self.cachepath, xsource, self.config) except SourceInitError: err = sys.exc_info()[1] - logger.error("Packages: %s" % err) + self.logger.error("Packages: %s" % err) source = None return source |