Merge pull request #2050 from seuros/conf_logger

Revert  printing config file

Changes.md

@@ -3,7 +3,6 @@ HEAD
 
 - Fix typo for generator test file name [dlackty, #2016]
 - Add Sidekiq::Middleware::Chain#prepend [seuros, #2029]
-- Debug: Print the used config file
 
 3.2.6
 -----------

Gemfile

@@ -12,6 +12,10 @@ platforms :ruby do
   gem 'sqlite3'
 end
 
+platforms :mri_21 do
+  gem 'pry-byebug'
+end
+
 platforms :jruby do
   gem 'jruby-openssl'
   gem 'activerecord-jdbcsqlite3-adapter'

lib/sidekiq/cli.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 $stdout.sync = true
 
 require 'yaml'
@@ -195,9 +196,8 @@ module Sidekiq
       @environment = cli_env || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
     end
 
-    def die(code)
-      exit(code)
-    end
+    alias_method :die, :exit
+    alias_method :☠, :exit
 
     def setup_options(args)
       opts = parse_options(args)
@@ -353,7 +353,6 @@ module Sidekiq
     def parse_config(cfile)
       opts = {}
       if File.exist?(cfile)
-        logger.debug "Using config file: #{cfile}"
         opts = YAML.load(ERB.new(IO.read(cfile)).result) || opts
         opts = opts.merge(opts.delete(environment) || {})
         parse_queues(opts, opts.delete(:queues) || [])

test/helper.rb

@@ -15,7 +15,7 @@ if ENV.has_key?("SIMPLECOV")
 end
 
 begin
-  require 'pry'
+  require 'pry-byebug'
 rescue LoadError
 end