From e5903129e1abe0979a2a5a80a38c2800060b8e90 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Wed, 10 Feb 2010 22:12:34 -0800
Subject: [PATCH] Logger now uses singleton on the Vagrant::Logger class. Tests
 included.

---
 lib/vagrant/util.rb       | 24 +++++++++++++++------
 test/vagrant/util_test.rb | 45 +++++++++++++++++++++++++++++++++------
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/lib/vagrant/util.rb b/lib/vagrant/util.rb
index c36197d8b..a29642c3b 100644
--- a/lib/vagrant/util.rb
+++ b/lib/vagrant/util.rb
@@ -12,16 +12,28 @@ error
     end
 
     def logger
-      # TODO: Buffer messages until config is loaded, then output them?
-      if Vagrant.config.loaded?
-        @logger ||= Vagrant::Logger.new(Vagrant.config.vagrant.log_output)
-      else
-        Vagrant::Logger.new(nil)
-      end
+      Logger.singleton_logger
     end
   end
 
   class Logger < ::Logger
+    @@singleton_logger = nil
+
+    class <<self
+      def singleton_logger
+        # TODO: Buffer messages until config is loaded, then output them?
+        if Vagrant.config.loaded?
+          @@singleton_logger ||= Vagrant::Logger.new(Vagrant.config.vagrant.log_output)
+        else
+          Vagrant::Logger.new(nil)
+        end
+      end
+
+      def reset_logger!
+        @@singleton_logger = nil
+      end
+    end
+
     def format_message(level, time, progname, msg)
       "[#{level} #{time.strftime('%m-%d-%Y %X')}] Vagrant: #{msg}\n"
     end
diff --git a/test/vagrant/util_test.rb b/test/vagrant/util_test.rb
index 418eaa942..46f3a271f 100644
--- a/test/vagrant/util_test.rb
+++ b/test/vagrant/util_test.rb
@@ -11,23 +11,54 @@ class UtilTest < Test::Unit::TestCase
   end
 
   context "logger" do
+    class OtherUtil
+      extend Vagrant::Util
+    end
+
     setup do
       @config = Vagrant::Config::Top.new
+      @config.stubs(:loaded?).returns(true)
+      @config.vagrant.log_output = STDOUT
       Vagrant::Config.stubs(:config).returns(@config)
+      Vagrant::Logger.reset_logger!
+    end
+
+    teardown do
+      Vagrant::Logger.reset_logger!
     end
 
     should "return a logger to nil if config is not loaded" do
       @config.expects(:loaded?).returns(false)
-      Vagrant::Logger.expects(:new).with(nil).once.returns("foo")
-      assert_equal "foo", RegUtil.logger
+      logger = RegUtil.logger
+      assert_nil logger.instance_variable_get(:@logdev)
     end
 
     should "return a logger using the configured output" do
-      @config.stubs(:loaded?).returns(true)
-      @config.vagrant.log_output = "foo"
-      Vagrant::Logger.expects(:new).once.with("foo").returns("bar")
-      assert_equal "bar", RegUtil.logger
-      assert_equal "bar", RegUtil.logger
+      logger = RegUtil.logger
+      logdev = logger.instance_variable_get(:@logdev)
+      assert logger
+      assert !logdev.nil?
+      assert_equal STDOUT, logdev.dev
+    end
+
+    should "only instantiate a logger once" do
+      Vagrant::Logger.expects(:new).once.returns("GOOD")
+      RegUtil.logger
+      RegUtil.logger
+    end
+
+    should "be able to reset the logger" do
+      Vagrant::Logger.expects(:new).twice
+      RegUtil.logger
+      Vagrant::Logger.reset_logger!
+      RegUtil.logger
+    end
+
+    should "return the same logger across classes" do
+      logger = RegUtil.logger
+      other = OtherUtil.logger
+
+      assert logger.equal?(other)
     end
   end
 end