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.

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/puppet/ssl/certificate_authority.rb b/lib/puppet/ssl/certificate_authority.rb
index cd5d79f0a..6947af11c 100644
--- a/lib/puppet/ssl/certificate_authority.rb
+++ b/lib/puppet/ssl/certificate_authority.rb
@@ -1,5 +1,6 @@
 require 'puppet/ssl/host'
 require 'puppet/ssl/certificate_request'
+require 'puppet/util/cacher'
 
 # The class that knows how to sign certificates.  It creates
 # a 'special' SSL::Host whose name is 'ca', thus indicating
@@ -16,6 +17,8 @@ class Puppet::SSL::CertificateAuthority
 
     require 'puppet/ssl/certificate_authority/interface'
 
+    extend Puppet::Util::Cacher
+
     def self.ca?
         return false unless Puppet[:ca]
         return false unless Puppet[:name] == "puppetmasterd"
@@ -27,11 +30,7 @@ class Puppet::SSL::CertificateAuthority
     def self.instance
         return nil unless ca?
 
-        unless defined?(@instance) and @instance
-            @instance = new
-        end
-
-        @instance
+        attr_cache(:instance) { new }
     end
 
     attr_reader :name, :host