Adding logging when files are removed.

This is currently mostly useful for puppetca.

Signed-off-by: Luke Kanies <luke@madstop.com>

4 files changed, 18 insertions, 1 deletions

diff --git a/lib/puppet/indirector/file.rb b/lib/puppet/indirector/file.rb
index e5382155f..99d95ecb2 100644
--- a/lib/puppet/indirector/file.rb
+++ b/lib/puppet/indirector/file.rb
@@ -11,6 +11,7 @@ class Puppet::Indirector::File < Puppet::Indirector::Terminus
         end
         raise Puppet::Error.new("File %s does not exist; cannot destroy" % [request.key]) unless File.exist?(path)
 
+        Puppet.notice "Removing file %s %s at '%s'" % [model, request.key, path]
         begin
             File.unlink(path)
         rescue => detail
diff --git a/lib/puppet/indirector/ssl_file.rb b/lib/puppet/indirector/ssl_file.rb
index d93298c8c..4119a656f 100644
--- a/lib/puppet/indirector/ssl_file.rb
+++ b/lib/puppet/indirector/ssl_file.rb
@@ -68,6 +68,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
         path = path(request.key)
         return false unless FileTest.exist?(path)
 
+        Puppet.notice "Removing file %s %s at '%s'" % [model, request.key, path]
         begin
             File.unlink(path)
         rescue => detail
diff --git a/spec/unit/indirector/file.rb b/spec/unit/indirector/file.rb
index 67ead4cdb..d64ed9f57 100755
--- a/spec/unit/indirector/file.rb
+++ b/spec/unit/indirector/file.rb
@@ -140,6 +140,13 @@ describe Puppet::Indirector::File do
             proc { @searcher.destroy(@request) }.should raise_error(Puppet::Error)
         end
 
+        it "should log that is removing the file" do
+            File.expects(:exist?).returns(true)
+            File.expects(:unlink)
+            Puppet.expects(:notice)
+            @searcher.destroy(@request)
+        end
+
         it "should use the path() method to calculate the path if it exists" do
             @searcher.meta_def(:path) do |thing|
                 thing.to_s.upcase
diff --git a/spec/unit/indirector/ssl_file.rb b/spec/unit/indirector/ssl_file.rb
index 756101a00..89f682f38 100755
--- a/spec/unit/indirector/ssl_file.rb
+++ b/spec/unit/indirector/ssl_file.rb
@@ -9,7 +9,8 @@ require 'puppet/indirector/ssl_file'
 
 describe Puppet::Indirector::SslFile do
     before do
-        @indirection = stub 'indirection', :name => :testing
+        @model = mock 'model'
+        @indirection = stub 'indirection', :name => :testing, :model => @model
         Puppet::Indirector::Indirection.expects(:instance).with(:testing).returns(@indirection)
         @file_class = Class.new(Puppet::Indirector::SslFile) do
             def self.to_s
@@ -227,6 +228,13 @@ describe Puppet::Indirector::SslFile do
                     File.expects(:unlink).with(@certpath)
                     @searcher.destroy(@request)
                 end
+
+                it "should log that is removing the file" do
+                    File.stubs(:exist?).returns true
+                    File.stubs(:unlink)
+                    Puppet.expects(:notice)
+                    @searcher.destroy(@request)
+                end
             end
         end