diff options
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | config/deploy.rb | 7 | ||||
| -rw-r--r-- | config/initializers/apartment.rb | 1 | ||||
| -rw-r--r-- | config/initializers/delayed_job_config.rb | 6 | ||||
| -rw-r--r-- | config/initializers/devise_async.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20120516172252_create_delayed_jobs.rb | 22 | ||||
| -rw-r--r-- | db/schema.rb | 18 | ||||
| -rwxr-xr-x | script/delayed_job | 5 |
9 files changed, 1 insertions, 67 deletions
@@ -115,7 +115,6 @@ gem 'rabl' gem 'sidekiq' gem 'sinatra' -gem 'delayed_job_active_record' gem 'whenever', github: 'af83/whenever', require: false # '~> 0.9' gem 'rake' gem 'devise-async' diff --git a/Gemfile.lock b/Gemfile.lock index a3ede77d1..832da8645 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,11 +153,6 @@ GEM debug_inspector (0.0.2) deep_cloneable (2.0.2) activerecord (>= 3.1.0, < 5.0.0) - delayed_job (4.0.6) - activesupport (>= 3.0, < 5.0) - delayed_job_active_record (4.0.3) - activerecord (>= 3.0, < 5.0) - delayed_job (>= 3.0, < 4.1) devise (3.4.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -591,7 +586,6 @@ DEPENDENCIES daemons database_cleaner deep_cloneable (~> 2.0.0) - delayed_job_active_record devise (~> 3.4.0) devise-async devise-encryptable diff --git a/config/deploy.rb b/config/deploy.rb index 34d1b6e4d..bfbcabb4e 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -78,10 +78,3 @@ namespace :deploy do run "cd #{current_path} && #{bundle_cmd} exec /var/lib/gems/2.2.0/bin/rake db:seed RAILS_ENV=#{rails_env}" end end - -namespace :delayed_job do - task :restart do - run "sudo /etc/init.d/stif-boiv restart" - end - # after "deploy:restart", "delayed_job:restart" -end diff --git a/config/initializers/apartment.rb b/config/initializers/apartment.rb index 7a3549c02..70bda1462 100644 --- a/config/initializers/apartment.rb +++ b/config/initializers/apartment.rb @@ -21,7 +21,6 @@ Apartment.configure do |config| "Referential", "Organisation", "User", - "Delayed::Backend::ActiveRecord::Job", "Api::V1::ApiKey", "RuleParameterSet", "StopAreaReferential", diff --git a/config/initializers/delayed_job_config.rb b/config/initializers/delayed_job_config.rb deleted file mode 100644 index 147b2550e..000000000 --- a/config/initializers/delayed_job_config.rb +++ /dev/null @@ -1,6 +0,0 @@ -# config/initializers/delayed_job_config.rb -#Delayed::Job.destroy_failed_jobs = false -silence_warnings do - Delayed::Job.const_set("MAX_ATTEMPTS", 1) - Delayed::Job.const_set("MAX_RUN_TIME", 12.hours) -end
\ No newline at end of file diff --git a/config/initializers/devise_async.rb b/config/initializers/devise_async.rb index 3ee0a7858..10f4d98b6 100644 --- a/config/initializers/devise_async.rb +++ b/config/initializers/devise_async.rb @@ -1,2 +1,2 @@ -Devise::Async.backend = :delayed_job +Devise::Async.backend = :sidekiq Devise::Async.enabled = false # Set to true to use Delayed Job for asynchronous mail diff --git a/db/migrate/20120516172252_create_delayed_jobs.rb b/db/migrate/20120516172252_create_delayed_jobs.rb deleted file mode 100644 index e7841608c..000000000 --- a/db/migrate/20120516172252_create_delayed_jobs.rb +++ /dev/null @@ -1,22 +0,0 @@ -class CreateDelayedJobs < ActiveRecord::Migration - def self.up - create_table :delayed_jobs, :force => true do |table| - table.integer :priority, :default => 0 # Allows some jobs to jump to the front of the queue - table.integer :attempts, :default => 0 # Provides for retries, but still fail eventually. - table.text :handler # YAML-encoded string of the object that will do work - table.text :last_error # reason for last failure (See Note below) - table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. - table.datetime :locked_at # Set when a client is working on this object - table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) - table.string :locked_by # Who is working on this object (if locked) - table.string :queue # The name of the queue this job is in - table.timestamps - end - - add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' - end - - def self.down - drop_table :delayed_jobs - end -end diff --git a/db/schema.rb b/db/schema.rb index 012a86d76..baf25daa5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -124,22 +124,6 @@ ActiveRecord::Schema.define(version: 20161109160857) do add_index "connection_links", ["objectid"], :name => "connection_links_objectid_key", :unique => true - create_table "delayed_jobs", force: true do |t| - t.integer "priority", default: 0 - t.integer "attempts", default: 0 - t.text "handler" - t.text "last_error" - t.datetime "run_at" - t.datetime "locked_at" - t.datetime "failed_at" - t.string "locked_by" - t.string "queue" - t.datetime "created_at" - t.datetime "updated_at" - end - - add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" - create_table "exports", force: true do |t| t.integer "referential_id", limit: 8 t.string "status" @@ -723,8 +707,6 @@ ActiveRecord::Schema.define(version: 20161109160857) do add_index "workbenches", ["stop_area_referential_id"], :name => "index_workbenches_on_stop_area_referential_id" Foreigner.load - add_foreign_key "access_links", "access_points", name: "aclk_acpt_fkey", dependent: :delete - add_foreign_key "group_of_lines_lines", "group_of_lines", name: "groupofline_group_fkey", dependent: :delete add_foreign_key "journey_frequencies", "timebands", name: "journey_frequencies_timeband_id_fk", dependent: :nullify diff --git a/script/delayed_job b/script/delayed_job deleted file mode 100755 index edf195985..000000000 --- a/script/delayed_job +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env ruby - -require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment')) -require 'delayed/command' -Delayed::Command.new(ARGV).daemonize |