Refactor Sidekiq::Logging and handling of --verbose in Sidekiq::CLI

lib/sidekiq/cli.rb

@@ -18,7 +18,7 @@ end
 trap 'USR2' do
   if Sidekiq.options[:logfile]
     Sidekiq.logger.info "Received USR2, reopening log file"
-    Sidekiq.logger = Sidekiq::Logging.new_file_logger(Sidekiq.options[:logfile])
+    Sidekiq::Logging.initialize_logger(Sidekiq.options[:logfile])
   end
 end
 
@@ -172,8 +172,8 @@ module Sidekiq
           parse_queues opts, queues_and_weights
         end
 
-        o.on "-v", "--verbose", "Print more verbose output" do
-          Sidekiq.logger.level = ::Logger::DEBUG
+        o.on "-v", "--verbose", "Print more verbose output" do |arg|
+          opts[:verbose] = arg
         end
 
         o.on '-e', '--environment ENV', "Application environment" do |arg|
@@ -224,11 +224,7 @@ module Sidekiq
     end
 
     def initialize_logger
-      if options[:logfile]
-        Sidekiq.logger = Sidekiq::Logging.new_file_logger(options[:logfile])
-      else
-        Sidekiq.logger
-      end
+      Sidekiq::Logging.initialize_logger(options[:logfile]) if options[:logfile]
 
       Sidekiq.logger.level = Logger::DEBUG if options[:verbose]
       Celluloid.logger = nil unless options[:verbose]

lib/sidekiq/logging.rb

@@ -25,12 +25,15 @@ module Sidekiq
       end
     end
 
-    def self.new_file_logger(file_path)
-      initialize_logger(file_path)
+    def self.initialize_logger(log_target = STDOUT)
+      @logger = Logger.new(log_target)
+      @logger.level = Logger::INFO
+      @logger.formatter = Pretty.new
+      @logger
     end
 
     def self.logger
-      @logger ||= initialize_logger(STDOUT)
+      @logger || initialize_logger
     end
 
     def self.logger=(log)
@@ -40,14 +43,5 @@ module Sidekiq
     def logger
       Sidekiq::Logging.logger
     end
-
-    private
-
-    def self.initialize_logger(log_target)
-      log = Logger.new(log_target)
-      log.level = Logger::INFO
-      log.formatter = Pretty.new
-      log
-    end
   end
 end

test/test_cli.rb

@@ -80,6 +80,7 @@ class TestCli < MiniTest::Unit::TestCase
       @cli.parse(['sidekiq', '-v', '-r', './test/fake_env.rb'])
       assert_equal Logger::DEBUG, Sidekiq.logger.level
       # If we leave the logger at DEBUG it'll add a lot of noise to the test output
+      Sidekiq.options.delete(:verbose)
       Sidekiq.logger.level = old
     end