From 6dd9756f7a87d5e875f5db02f306c7b906902a96 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 29 Oct 2013 10:21:12 -0400 Subject: Plugins: refactored out unnecessary datastore constructor argument --- src/lib/Bcfg2/Server/Plugins/Probes.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Probes.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index 6b0c91fd1..ec5c1ab9f 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -121,8 +121,7 @@ class DBProbeStore(ProbeStore, Bcfg2.Server.Plugin.DatabaseBacked): create = False def __init__(self, core, datadir): - Bcfg2.Server.Plugin.DatabaseBacked.__init__(self, core, - os.path.dirname(datadir)) + Bcfg2.Server.Plugin.DatabaseBacked.__init__(self, core) ProbeStore.__init__(self, core, datadir) @property @@ -259,7 +258,7 @@ class XMLProbeStore(ProbeStore): pretty_print='true') except IOError: err = sys.exc_info()[1] - self.logger.error("Failed to write probed.xml: %s" % err) + self.logger.error("Failed to write %s: %s" % (self._fname, err)) def set_groups(self, hostname, groups): Bcfg2.Server.Cache.expire("Probes", "probegroups", hostname) @@ -428,10 +427,10 @@ class Probes(Bcfg2.Server.Plugin.Probing, help="Use database capabilities of the Probes plugin")] options_parsed_hook = staticmethod(load_django_models) - def __init__(self, core, datastore): + def __init__(self, core): Bcfg2.Server.Plugin.Probing.__init__(self) Bcfg2.Server.Plugin.Connector.__init__(self) - Bcfg2.Server.Plugin.DatabaseBacked.__init__(self, core, datastore) + Bcfg2.Server.Plugin.DatabaseBacked.__init__(self, core) try: self.probes = ProbeSet(self.data, self.name) -- cgit v1.2.3-1-g7c22