From 7d60147435d1cf5ce76247203e956fc6e9be9f33 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Wed, 12 Nov 2014 16:19:45 +0000
Subject: [PATCH 1/3] alias method (die,exit)

---
 lib/sidekiq/cli.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
index 60735c5b..e112122c 100644
--- a/lib/sidekiq/cli.rb
+++ b/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)

From e30a19a5325cb576de298069ed105fa192606e49 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Wed, 12 Nov 2014 16:22:49 +0000
Subject: [PATCH 2/3] Add debugging tools by default (byebug and pry)

---
 Gemfile        | 4 ++++
 test/helper.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index d1365614..6d56ae8b 100644
--- a/Gemfile
+++ b/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'
diff --git a/test/helper.rb b/test/helper.rb
index 03ff0e0f..538b6a14 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -15,7 +15,7 @@ if ENV.has_key?("SIMPLECOV")
 end
 
 begin
-  require 'pry'
+  require 'pry-byebug'
 rescue LoadError
 end
 

From bc4ca4b28a4bf28860b8d163dd8515fd0a739794 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Fri, 14 Nov 2014 17:14:00 +0000
Subject: [PATCH 3/3] Revert c5d9d3e746c132cb66c71d19a2e97dee3f8fcc91

---
 Changes.md         | 1 -
 lib/sidekiq/cli.rb | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Changes.md b/Changes.md
index b3db1761..c3b9f985 100644
--- a/Changes.md
+++ b/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
 -----------
diff --git a/lib/sidekiq/cli.rb b/lib/sidekiq/cli.rb
index e112122c..00ba1d14 100644
--- a/lib/sidekiq/cli.rb
+++ b/lib/sidekiq/cli.rb
@@ -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) || [])