Use proper logger form configuration

capistrano · Jul 26, 2012 · ffe860f · ffe860f
1 parent e82de1c
commit ffe860f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/capistrano/recipes/deploy/strategy/base.rb b/lib/capistrano/recipes/deploy/strategy/base.rb
@@ -73,7 +73,7 @@ def system(*args)
         private
 
           def logger
-            @logger ||= configuration[:logger] || Capistrano::Logger.new(:output => STDOUT)
+            @logger ||= configuration.logger || Capistrano::Logger.new(:output => STDOUT)
           end
 
           # The revision to deploy. Must return a real revision identifier,

diff --git a/test/deploy/strategy/copy_test.rb b/test/deploy/strategy/copy_test.rb
@@ -6,10 +6,11 @@
 class DeployStrategyCopyTest < Test::Unit::TestCase
   def setup
     @config = { :application => "captest",
-                :logger => Capistrano::Logger.new(:output => StringIO.new),
                 :releases_path => "/u/apps/test/releases",
                 :release_path => "/u/apps/test/releases/1234567890",
                 :real_revision => "154" }
+    @config.stubs(:logger).returns(stub_everything)
+
     @source = mock("source")
     @config.stubs(:source).returns(@source)
     @strategy = Capistrano::Deploy::Strategy::Copy.new(@config)