Support the old verbose/very_verbose logging

implement this as Logger formatters on top of stdlib's Logger.
You must specify the Logger first before setting verbose/very_verbose

Author: hone

lib/resque.rb

@@ -11,6 +11,9 @@
 require 'resque/helpers'
 require 'resque/stat'
 require 'resque/logging'
+require 'resque/log_formatters/quiet_formatter'
+require 'resque/log_formatters/verbose_formatter'
+require 'resque/log_formatters/very_verbose_formatter'
 require 'resque/job'
 require 'resque/worker'
 require 'resque/plugin'

lib/resque/log_formatters/quiet_formatter.rb

@@ -0,0 +1,7 @@
+module Resque
+  class QuietFormatter
+    def call(serverity, datetime, progname, msg)
+      ""
+    end
+  end
+end

lib/resque/log_formatters/verbose_formatter.rb

@@ -0,0 +1,7 @@
+module Resque
+  class VerboseFormatter
+    def call(serverity, datetime, progname, msg)
+      "*** #{msg}"
+    end
+  end
+end

lib/resque/log_formatters/very_verbose_formatter.rb

@@ -0,0 +1,8 @@
+module Resque
+  class VeryVerboseFormatter
+    def call(serverity, datetime, progname, msg)
+      time = Time.now.strftime('%H:%M:%S %Y-%m-%d')
+      "** [#{time}] #$$: #{msg}"
+    end
+  end
+end

lib/resque/worker.rb

@@ -610,11 +610,41 @@ def procline(string)
     #
     #     Resque.logger.level = Logger::DEBUG
     #
-    def verbose; logger_severity_deprecation_warning; end
-    def very_verbose; logger_severity_deprecation_warning; end
-    def verbose=(_); logger_severity_deprecation_warning; end
-    def very_verbose=(_); logger_severity_deprecation_warning; end
-    
+    def verbose
+      logger_severity_deprecation_warning
+      @verbose
+    end
+
+    def very_verbose
+      logger_severity_deprecation_warning
+      @very_verbose
+    end
+
+    def verbose=(value);
+      logger_severity_deprecation_warning
+
+      if value && !very_verbose
+        Resque.logger.formatter = VerboseFormatter.new
+      elsif !value
+        Resque.logger.formatter = QuietFormatter.new
+      end
+
+      @verbose = value
+    end
+
+    def very_verbose=(value)
+      logger_severity_deprecation_warning
+      if value
+        Resque.logger.formatter = VeryVerboseFormatter.new
+      elsif !value && verbose
+        Resque.logger.formatter = VerboseFormatter.new
+      else
+        Resque.logger.formatter = QuietFormatter.new
+      end
+
+      @very_verbose = value
+    end
+
     def logger_severity_deprecation_warning
       return if $warned_logger_severity_deprecation
       puts "*** DEPRECATION WARNING: Resque::Worker#verbose and #very_verbose are deprecated. Please set Resque.logger.level instead"

test/worker_test.rb

@@ -399,22 +399,81 @@ def self.perform
     assert !$BEFORE_FORK_CALLED, "before_fork should not have been called after job runs"
   end
 
+  test "setting verbose to true" do
+    @worker.verbose = true
+
+    assert @worker.verbose
+    assert !@worker.very_verbose
+  end
+
+  test "setting verbose to false" do
+    @worker.verbose = false
+
+    assert !@worker.verbose
+    assert !@worker.very_verbose
+  end
+
+  test "setting very_verbose to true" do
+    @worker.very_verbose = true
+
+    assert !@worker.verbose
+    assert @worker.very_verbose
+  end
+
+  test "setting setting verbose to true and then very_verbose to false" do
+    @worker.very_verbose = true
+    @worker.verbose      = true
+    @worker.very_verbose = false
+
+    assert @worker.verbose
+    assert !@worker.very_verbose
+  end
+
+  test "verbose prints out logs" do
+    messages        = StringIO.new
+    Resque.logger   = Logger.new(messages)
+    @worker.verbose = true
+
+    begin
+      @worker.log("omghi mom")
+    ensure
+      reset_logger
+    end
+
+    assert_equal "*** omghi mom", messages.string
+  end
+
+  test "unsetting verbose works" do
+    messages        = StringIO.new
+    Resque.logger   = Logger.new(messages)
+    @worker.verbose = true
+    @worker.verbose = false
+
+    begin
+      @worker.log("omghi mom")
+    ensure
+      reset_logger
+    end
+
+    assert_equal "", messages.string
+  end
+
   test "very verbose works in the afternoon" do
+    messages        = StringIO.new
+    Resque.logger   = Logger.new(messages)
+
     begin
       require 'time'
       last_puts = ""
       Time.fake_time = Time.parse("15:44:33 2011-03-02")
 
-      @worker.extend(Module.new {
-        define_method(:puts) { |thing| last_puts = thing }
-      })
-
       @worker.very_verbose = true
       @worker.log("some log text")
 
-      assert_match /\*\* \[15:44:33 2011-03-02\] \d+: some log text/, last_puts
+      assert_match /\*\* \[15:44:33 2011-03-02\] \d+: some log text/, messages.string
     ensure
       Time.fake_time = nil
+      reset_logger
     end
   end