Adding a 'close_all' method to the Log class.

This moves the code out of Daemon.

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

2 files changed, 15 insertions, 0 deletions

diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb
index b57faad42..a74432021 100644
--- a/lib/puppet/util/log.rb
+++ b/lib/puppet/util/log.rb
@@ -104,6 +104,13 @@ class Puppet::Util::Log
         end
     end
 
+    def self.close_all
+        # And close all logs except the console.
+        destinations.each do |dest|
+            close(dest)
+        end
+    end
+
     # Flush any log destinations that support such operations.
     def Log.flush
         @destinations.each { |type, dest|
diff --git a/spec/unit/util/log.rb b/spec/unit/util/log.rb
index c42b25c74..b996f17a0 100755
--- a/spec/unit/util/log.rb
+++ b/spec/unit/util/log.rb
@@ -5,6 +5,14 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f
 require 'puppet/util/log'
 
 describe Puppet::Util::Log do
+    it "should be able to close all log destinations" do
+        Puppet::Util::Log.expects(:destinations).returns %w{foo bar}
+        Puppet::Util::Log.expects(:close).with("foo")
+        Puppet::Util::Log.expects(:close).with("bar")
+
+        Puppet::Util::Log.close_all
+    end
+
     describe "instances" do
         before do
             Puppet::Util::Log.stubs(:newmessage)