added a module-level FAM object to avoid passing it as an argument a billion times

6 files changed, 18 insertions, 27 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
index ec0d8e828..7ddb04ef6 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Apt.py
@@ -13,8 +13,7 @@ class AptCollection(Collection):
     overrides nothing, and defers all operations to :class:`PacSource`
     """
 
-    def __init__(self, metadata, sources, cachepath, basepath, fam,
-                 debug=False):
+    def __init__(self, metadata, sources, cachepath, basepath, debug=False):
         # we define an __init__ that just calls the parent __init__,
         # so that we can set the docstring on __init__ to something
         # different from the parent __init__ -- namely, the parent
@@ -22,7 +21,7 @@ class AptCollection(Collection):
         # which we use to delineate the actual docs from the
         # .. autoattribute hacks we have to do to get private
         # attributes included in sphinx 1.0 """
-        Collection.__init__(self, metadata, sources, cachepath, basepath, fam,
+        Collection.__init__(self, metadata, sources, cachepath, basepath,
                             debug=debug)
     __init__.__doc__ = Collection.__init__.__doc__.split(".. -----")[0]
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
index f9bb9e1a2..8f85d84c9 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Collection.py
@@ -78,6 +78,7 @@ import copy
 import logging
 import lxml.etree
 import Bcfg2.Server.Plugin
+import Bcfg2.Server.FileMonitor
 from Bcfg2.Compat import any, md5  # pylint: disable=W0622
 
 LOGGER = logging.getLogger(__name__)
@@ -93,8 +94,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
     #: Whether or not this Packages backend supports package groups
     __package_groups__ = False
 
-    def __init__(self, metadata, sources, cachepath, basepath, fam,
-                 debug=False):
+    def __init__(self, metadata, sources, cachepath, basepath, debug=False):
         """
         :param metadata: The client metadata for this collection
         :type metadata: Bcfg2.Server.Plugins.Metadata.ClientMetadata
@@ -111,9 +111,6 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
                          directory, where more permanent data can be
                          stored
         :type basepath: string
-        :param fam: A file monitor object to use if this Collection
-                    needs to monitor for file activity
-        :type fam: Bcfg2.Server.FileMonitor.FileMonitor
         :param debug: Enable debugging output
         :type debug: bool
 
@@ -127,7 +124,7 @@ class Collection(list, Bcfg2.Server.Plugin.Debuggable):
         self.basepath = basepath
         self.cachepath = cachepath
         self.virt_pkgs = dict()
-        self.fam = fam
+        self.fam = Bcfg2.Server.FileMonitor.get_fam()
 
         try:
             self.setup = sources[0].setup
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
index 99aed5ce5..3cd494434 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Pac.py
@@ -12,8 +12,7 @@ class PacCollection(Collection):
     overrides nothing, and defers all operations to :class:`PacSource`
     """
 
-    def __init__(self, metadata, sources, cachepath, basepath, fam,
-                 debug=False):
+    def __init__(self, metadata, sources, cachepath, basepath, debug=False):
         # we define an __init__ that just calls the parent __init__,
         # so that we can set the docstring on __init__ to something
         # different from the parent __init__ -- namely, the parent
@@ -21,7 +20,7 @@ class PacCollection(Collection):
         # which we use to delineate the actual docs from the
         # .. autoattribute hacks we have to do to get private
         # attributes included in sphinx 1.0 """
-        Collection.__init__(self, metadata, sources, cachepath, basepath, fam,
+        Collection.__init__(self, metadata, sources, cachepath, basepath,
                             debug=debug)
     __init__.__doc__ = Collection.__init__.__doc__.split(".. -----")[0]
 
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
index afa5da4c5..e06fc0410 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
@@ -19,7 +19,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
 
     encryption = False
 
-    def __init__(self, filename, cachepath, fam, packages, setup):
+    def __init__(self, filename, cachepath, packages, setup):
         """
         :param filename: The full path to ``sources.xml``
         :type filename: string
@@ -27,9 +27,6 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
                           :class:`Bcfg2.Server.Plugins.Packages.Source.Source`
                           data will be cached
         :type cachepath: string
-        :param fam: The file access monitor to use to create watches
-                    on ``sources.xml`` and any XIncluded files.
-        :type fam: Bcfg2.Server.FileMonitor.FileMonitor
         :param packages: The Packages plugin object ``sources.xml`` is
                          being parsed on behalf of (i.e., the calling
                          object)
@@ -42,7 +39,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
         """
         Bcfg2.Server.Plugin.Debuggable.__init__(self)
         try:
-            Bcfg2.Server.Plugin.StructFile.__init__(self, filename, fam=fam,
+            Bcfg2.Server.Plugin.StructFile.__init__(self, filename,
                                                     should_monitor=True)
         except OSError:
             err = sys.exc_info()[1]
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
index 37171e1b1..17aff900b 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
@@ -59,6 +59,7 @@ import socket
 import logging
 import lxml.etree
 from subprocess import Popen, PIPE
+import Bcfg2.Server.FileMonitor
 import Bcfg2.Server.Plugin
 # pylint: disable=W0622
 from Bcfg2.Compat import StringIO, cPickle, HTTPError, URLError, \
@@ -174,7 +175,7 @@ class PulpCertificateSet(Bcfg2.Server.Plugin.EntrySet):
     #: The path to certificates on consumer machines
     certpath = "/etc/pki/consumer/cert.pem"
 
-    def __init__(self, path, fam):
+    def __init__(self, path):
         """
         :param path: The path to the directory where Pulp consumer
                      certificates will be stored
@@ -192,7 +193,7 @@ class PulpCertificateSet(Bcfg2.Server.Plugin.EntrySet):
                              important='true',
                              sensitive='true',
                              paranoid=self.metadata['paranoid'])
-        self.fam = fam
+        self.fam = Bcfg2.Server.FileMonitor.get_fam().
         self.fam.AddMonitor(path, self)
 
     def HandleEvent(self, event):
@@ -271,9 +272,8 @@ class YumCollection(Collection):
     #: :class:`PulpCertificateSet` object used to handle Pulp certs
     pulp_cert_set = None
 
-    def __init__(self, metadata, sources, cachepath, basepath, fam,
-                 debug=False):
-        Collection.__init__(self, metadata, sources, cachepath, basepath, fam,
+    def __init__(self, metadata, sources, cachepath, basepath, debug=False):
+        Collection.__init__(self, metadata, sources, cachepath, basepath,
                             debug=debug)
         self.keypath = os.path.join(self.cachepath, "keys")
 
@@ -309,7 +309,7 @@ class YumCollection(Collection):
                         self.logger.error("Could not create Pulp consumer "
                                           "cert directory at %s: %s" %
                                           (certdir, err))
-                self.pulp_cert_set = PulpCertificateSet(certdir, self.fam)
+                self.pulp_cert_set = PulpCertificateSet(certdir)
 
     @property
     def __package_groups__(self):
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index f30e060bd..c1915eeb4 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -79,7 +79,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         #: :class:`Bcfg2.Server.Plugins.Packages.Source.Source` objects for
         #: this plugin.
         self.sources = PackagesSources(os.path.join(self.data, "sources.xml"),
-                                       self.cachepath, core.fam, self,
+                                       self.cachepath, self,
                                        self.core.setup)
 
         #: We cache
@@ -477,8 +477,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         if not self.sources.loaded:
             # if sources.xml has not received a FAM event yet, defer;
             # instantiate a dummy Collection object
-            return Collection(metadata, [], self.cachepath, self.data,
-                              self.core.fam)
+            return Collection(metadata, [], self.cachepath, self.data)
 
         if metadata.hostname in self.clients:
             return self.collections[self.clients[metadata.hostname]]
@@ -509,7 +508,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
                               "for %s" % (cclass.__name__, metadata.hostname))
 
         collection = cclass(metadata, relevant, self.cachepath, self.data,
-                            self.core.fam, debug=self.debug_flag)
+                            debug=self.debug_flag)
         ckey = collection.cachekey
         self.clients[metadata.hostname] = ckey
         self.collections[ckey] = collection