From 7b20395b638d43925ac52e02a2ec8db154219f96 Mon Sep 17 00:00:00 2001
From: Mathieu Magnin <mathieu.magnin@gmail.com>
Date: Tue, 26 Sep 2017 15:50:39 +0200
Subject: [PATCH] Remove sidekiq traces

---
 Gemfile                        |  5 -----
 Gemfile.lock                   | 38 +++++++---------------------------
 config/deploy.rb               |  5 ++---
 config/initializers/sidekiq.rb |  6 ------
 config/routes.rb               |  3 ---
 config/sidekiq.yml             |  7 -------
 6 files changed, 10 insertions(+), 54 deletions(-)
 delete mode 100644 config/initializers/sidekiq.rb
 delete mode 100644 config/sidekiq.yml

diff --git a/Gemfile b/Gemfile
index be12e52ef..a68d6e3f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -96,11 +96,6 @@ gem 'newrelic_rpm'
 
 gem 'scenic'
 
-# Sidekiq
-gem 'sidekiq'
-gem 'sidekiq-cron', '~> 0.4.4'
-gem 'sinatra', git: 'https://github.com/sinatra/sinatra.git', require: false
-
 # Cron jobs
 gem 'delayed_job_active_record'
 gem "daemons"
diff --git a/Gemfile.lock b/Gemfile.lock
index 950868119..6ce018ead 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,18 +7,6 @@ GIT
       open4 (~> 1.3.4)
       rake
 
-GIT
-  remote: https://github.com/sinatra/sinatra.git
-  revision: d0c4053fd459be9f2c207cfeec5c0606461c014b
-  specs:
-    rack-protection (2.0.0.rc1)
-      rack
-    sinatra (2.0.0.rc1)
-      mustermann (= 1.0.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.0.rc1)
-      tilt (~> 2.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -121,7 +109,6 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.0.5)
-    connection_pool (2.2.1)
     copy_carrierwave_file (1.3.0)
       carrierwave (>= 0.9)
     crack (0.4.3)
@@ -408,7 +395,7 @@ GEM
     minitest (5.10.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    mustermann (1.0.0)
+    mustermann (1.0.1)
     nenv (0.3.0)
     netrc (0.11.0)
     newrelic_rpm (3.18.1.330)
@@ -468,6 +455,8 @@ GEM
       httpclient (>= 2.4)
       multi_json (>= 1.3.6)
       rack (>= 1.1)
+    rack-protection (2.0.0)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.0.1)
@@ -511,8 +500,6 @@ GEM
       trollop (~> 2.1)
     rdoc (4.3.0)
     redis (3.3.3)
-    redis-namespace (1.5.3)
-      redis (~> 3.0, >= 3.0.4)
     ref (2.0.0)
     request_store (1.3.1)
     responders (2.3.0)
@@ -561,8 +548,6 @@ GEM
     ruby_parser (3.8.3)
       sexp_processor (~> 4.1)
     rubyzip (1.0.0)
-    rufus-scheduler (3.3.4)
-      tzinfo
     safe_yaml (1.0.4)
     sass (3.4.22)
     sass-rails (5.0.6)
@@ -589,18 +574,14 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (3.1.1)
       activesupport (>= 4.0.0)
-    sidekiq (4.2.9)
-      concurrent-ruby (~> 1.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      rack-protection (>= 1.5.0)
-      redis (~> 3.2, >= 3.2.1)
-    sidekiq-cron (0.4.5)
-      redis-namespace (>= 1.5.2)
-      rufus-scheduler (>= 2.0.24)
-      sidekiq (>= 4.2.1)
     simple_form (3.4.0)
       actionpack (> 4, < 5.1)
       activemodel (> 4, < 5.1)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
     slop (3.6.0)
     smart_listing (1.2.0)
       coffee-rails
@@ -759,10 +740,7 @@ DEPENDENCIES
   select2-rails
   sentry-raven
   shoulda-matchers
-  sidekiq
-  sidekiq-cron (~> 0.4.4)
   simple_form
-  sinatra!
   smart_listing
   spreadsheet_architect
   spring
diff --git a/config/deploy.rb b/config/deploy.rb
index c6c264d9c..0a48ab1a3 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -58,7 +58,6 @@ set :shared_paths, [
                      "config/fog_credentials.yml",
                      'config/initializers/secret_token.rb',
                      'config/initializers/features.yml',
-                     'config/initializers/sidekiq.rb',
                      "config/environments/#{rails_env}.rb",
                      "config/initializers/token.rb",
                      "config/initializers/urls.rb",
@@ -131,7 +130,7 @@ desc "Deploys the current version to the server."
 task :deploy => :environment do
   queue 'export PATH=$PATH:/usr/local/rbenv/bin:/usr/local/rbenv/shims'
   deploy do
-    queue %[sudo stop sidekiq_#{user!} || true]
+    queue %[sudo stop delayed_job_#{user!} || true]
     # Put things that will set up an empty directory into a fully set-up
     # instance of your project.
     invoke :'git:clone'
@@ -142,7 +141,7 @@ task :deploy => :environment do
 
     to :launch do
       queue "/etc/init.d/#{user} upgrade "
-      queue! %[sudo start sidekiq_#{user!}]
+      queue! %[sudo start delayed_job_#{user!}]
 
       queue "cd #{deploy_to}/#{current_path}/"
       queue "bundle exec rake db:seed RAILS_ENV=#{rails_env}"
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
deleted file mode 100644
index a61ed5e57..000000000
--- a/config/initializers/sidekiq.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Sidekiq.configure_server do |config|
-  Sidekiq::Logging.logger = Rails.logger
-
-  schedule_file = "config/schedule.yml"
-  Sidekiq::Cron::Job.load_from_hash YAML.load_file(schedule_file)
-end
diff --git a/config/routes.rb b/config/routes.rb
index aac7387bf..dbaa51e86 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -47,9 +47,6 @@ Rails.application.routes.draw do
   authenticate :administration do
     resources :administrations, only: [:index, :create]
     namespace :administrations do
-      require 'sidekiq/web'
-      require 'sidekiq/cron/web'
-      mount Sidekiq::Web => '/sidekiq'
       match "/delayed_job" => DelayedJobWeb, :anchor => false, :via => [:get, :post]
     end
   end
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
deleted file mode 100644
index 0fe0c4360..000000000
--- a/config/sidekiq.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-:concurrency: 5
-staging:
-  :concurrency: 2
-production:
-  :concurrency: 2
-:queues:
-  - default