[#4114] Added queueing to the log

The log will now queue any log messages created when there is no
destination, and will flush the queue when a destination is added.

2 files changed, 24 insertions, 1 deletions

diff --git a/spec/unit/util/log_spec.rb b/spec/unit/util/log_spec.rb
index 7aaa580c5..df3c36ff2 100755
--- a/spec/unit/util/log_spec.rb
+++ b/spec/unit/util/log_spec.rb
@@ -5,8 +5,19 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f
 require 'puppet/util/log'
 
 describe Puppet::Util::Log do
+    it "should write a given message to the specified destination" do
+        Puppet::Util::Log.newdestination(:array)
+        Puppet::Util::Log.new(:level => :notice, :message => "foo")
+        message = Puppet::Util::Log.destinations[:array].messages.shift.message
+        message.should == "foo"
+
+        Puppet::Util::Log.close_all
+    end
+
     it "should be able to close all log destinations" do
-        Puppet::Util::Log.expects(:destinations).returns %w{foo bar}
+        destinations = stub_everything('destinations')
+        destinations.stubs(:keys).returns %w{foo bar}
+        Puppet::Util::Log.expects(:destinations).returns(destinations)
         Puppet::Util::Log.expects(:close).with("foo")
         Puppet::Util::Log.expects(:close).with("bar")
 
@@ -84,6 +95,12 @@ describe Puppet::Util::Log do
             Puppet::Util::Log.new(:level => :notice, :message => :foo).message.should == "foo"
         end
 
+        it "should flush the log queue when the first destination is specified" do
+            Puppet::Util::Log.expects(:flushqueue)
+            Puppet::Util::Log.newdestination(:array)
+            Puppet::Util::Log.close_all
+        end
+
         it "should convert the level to a symbol if it's passed in as a string" do
             Puppet::Util::Log.new(:level => "notice", :message => :foo).level.should == :notice
         end
diff --git a/spec/unit/util/logging_spec.rb b/spec/unit/util/logging_spec.rb
index aee308eca..41b07d433 100755
--- a/spec/unit/util/logging_spec.rb
+++ b/spec/unit/util/logging_spec.rb
@@ -40,6 +40,12 @@ describe Puppet::Util::Logging do
             @logger.notice "foo"
         end
 
+        it "should queue logs sent without a specified destination" do
+            Puppet::Util::Log.expects(:queuemessage)
+
+            @logger.notice "foo"
+        end
+
         it "should use the path of any provided resource type" do
             resource = Puppet::Type.type(:mount).new :name => "foo"