Using the new Cacher class for handling cached data.

This provides a single, global bit for determining whether
a given piece of cached data is still valid.

2 files changed, 15 insertions, 23 deletions

diff --git a/lib/puppet/file_serving/configuration.rb b/lib/puppet/file_serving/configuration.rb
index ccf0957d1..9c38aaa19 100644
--- a/lib/puppet/file_serving/configuration.rb
+++ b/lib/puppet/file_serving/configuration.rb
@@ -5,25 +5,20 @@
 require 'puppet'
 require 'puppet/file_serving'
 require 'puppet/file_serving/mount'
+require 'puppet/util/cacher'
 
 class Puppet::FileServing::Configuration
     require 'puppet/file_serving/configuration/parser'
 
+    extend Puppet::Util::Cacher
+
     @config_fileuration = nil
 
     Mount = Puppet::FileServing::Mount
 
-    # Remove our singleton instance.
-    def self.clear_cache
-        @config_fileuration = nil
-    end
-
     # Create our singleton configuration.
     def self.create
-        unless @config_fileuration
-            @config_fileuration = new()
-        end
-        @config_fileuration
+        attr_cache(:configuration) { new() }
     end
 
     private_class_method  :new
diff --git a/lib/puppet/file_serving/mount.rb b/lib/puppet/file_serving/mount.rb
index 8e5bd03e8..c52cedbfb 100644
--- a/lib/puppet/file_serving/mount.rb
+++ b/lib/puppet/file_serving/mount.rb
@@ -4,6 +4,7 @@
 
 require 'puppet/network/authstore'
 require 'puppet/util/logging'
+require 'puppet/util/cacher'
 require 'puppet/file_serving'
 require 'puppet/file_serving/metadata'
 require 'puppet/file_serving/content'
@@ -12,12 +13,16 @@ require 'puppet/file_serving/content'
 # or content objects.
 class Puppet::FileServing::Mount < Puppet::Network::AuthStore
     include Puppet::Util::Logging
+    extend Puppet::Util::Cacher
 
-    @@localmap = nil
-
-    # Clear the cache.  This is only ever used for testing.
-    def self.clear_cache
-        @@localmap = nil
+    def self.localmap
+        attr_cache(:localmap) { 
+            {   "h" =>  Facter.value("hostname"),
+                "H" => [Facter.value("hostname"),
+                        Facter.value("domain")].join("."),
+                "d" =>  Facter.value("domain")
+            }
+        }
     end
 
     attr_reader :name
@@ -173,14 +178,6 @@ class Puppet::FileServing::Mount < Puppet::Network::AuthStore
     # Cache this manufactured map, since if it's used it's likely
     # to get used a lot.
     def localmap
-        unless @@localmap
-            @@localmap = {
-                "h" =>  Facter.value("hostname"),
-                "H" => [Facter.value("hostname"),
-                        Facter.value("domain")].join("."),
-                "d" =>  Facter.value("domain")
-            }
-        end
-        @@localmap
+        self.class.localmap
     end
 end