diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index db05464b57..f5c406e617 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -334,7 +334,6 @@ Layout/LineLength: - spec/services/variant_units/option_value_namer_spec.rb - spec/spec_helper.rb - spec/support/cancan_helper.rb - - spec/support/delayed_job_helper.rb - spec/support/matchers/delegate_matchers.rb - spec/support/matchers/select2_matchers.rb - spec/support/matchers/table_matchers.rb @@ -549,7 +548,6 @@ Metrics/BlockLength: - spec/models/tag_rule/discount_order_spec.rb - spec/requests/api/orders_spec.rb - spec/spec_helper.rb - - spec/support/delayed_job_helper.rb - spec/support/matchers/select2_matchers.rb - spec/support/matchers/table_matchers.rb - spec/swagger_helper.rb diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1013c35643..e383738009 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -781,7 +781,6 @@ Style/ClassEqualityComparison: - 'app/controllers/spree/admin/payments_controller.rb' - 'app/models/tag_rule/discount_order.rb' - 'spec/lib/open_food_network/group_buy_report_spec.rb' - - 'spec/support/delayed_job_helper.rb' # Offense count: 3 Style/ClassVars: @@ -1200,7 +1199,6 @@ Style/GuardClause: - 'lib/open_food_network/order_cycle_form_applicator.rb' - 'lib/open_food_network/rack_request_blocker.rb' - 'lib/spree/core/controller_helpers/respond_with.rb' - - 'spec/support/delayed_job_helper.rb' - 'spec/support/request/distribution_helper.rb' - 'spec/support/request/shop_workflow.rb' diff --git a/Gemfile b/Gemfile index 95701f8e06..9675f154fe 100644 --- a/Gemfile +++ b/Gemfile @@ -50,9 +50,6 @@ gem 'devise-token_authenticatable' gem 'jwt', '~> 2.2' gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect -gem 'daemons' -gem 'delayed_job_active_record' - gem 'kaminari', '~> 1.2.1' gem 'andand' diff --git a/Gemfile.lock b/Gemfile.lock index fe41d56b46..b0f13f60d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,6 @@ GEM crass (1.0.6) css_parser (1.9.0) addressable - daemons (1.4.0) dalli (2.7.11) database_cleaner (2.0.1) database_cleaner-active_record (~> 2.0.0) @@ -204,11 +203,6 @@ GEM ffi (~> 1.0) msgpack debugger-linecache (1.2.0) - delayed_job (4.1.9) - activesupport (>= 3.0, < 6.2) - delayed_job_active_record (4.1.6) - activerecord (>= 3.0, < 6.2) - delayed_job (>= 3.0, < 5) devise (4.8.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -669,13 +663,11 @@ DEPENDENCIES combine_pdf compass-rails custom_error_message! - daemons dalli database_cleaner db2fog! ddtrace debugger-linecache - delayed_job_active_record devise devise-encryptable devise-token_authenticatable diff --git a/config/initializers/datadog.rb b/config/initializers/datadog.rb index d6e1acde4b..aefe0f8003 100644 --- a/config/initializers/datadog.rb +++ b/config/initializers/datadog.rb @@ -1,8 +1,6 @@ if ENV['DATADOG_RAILS_APM'] Datadog.configure do |c| c.use :rails, service_name: 'rails' - c.use :delayed_job, service_name: 'delayed_job' - c.use :dalli, service_name: 'memcached' c.analytics_enabled = true c.runtime_metrics_enabled = true diff --git a/config/initializers/delayed_job.rb b/config/initializers/delayed_job.rb deleted file mode 100644 index 53d7540c39..0000000000 --- a/config/initializers/delayed_job.rb +++ /dev/null @@ -1,17 +0,0 @@ -Delayed::Worker.destroy_failed_jobs = false -Delayed::Worker.max_run_time = 15.minutes - -# Uncomment the next line if you want jobs to be executed straight away. -# For example you want emails to be opened in your browser while testing. -#Delayed::Worker.delay_jobs = false - -# Notify bugsnag when a job fails -# Code adapted from http://trevorturk.com/2011/01/25/notify-hoptoad-if-theres-an-exception-in-delayedjob/ -class Delayed::Worker - alias_method :original_handle_failed_job, :handle_failed_job - - def handle_failed_job(job, error) - Bugsnag.notify(error) - original_handle_failed_job(job, error) - end -end diff --git a/script/ci/load_staging_baseline.sh b/script/ci/load_staging_baseline.sh deleted file mode 100755 index 45a57cf5c0..0000000000 --- a/script/ci/load_staging_baseline.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Every time staging is deployed, we load a baseline data set before running the new code's -# migrations. This script loads the baseline data set, after first taking a backup of the -# current database. - -set -e -source "`dirname $0`/includes.sh" - -# We need ruby to call script/delayed_job -export PATH="$HOME/.rbenv/shims:$PATH" - -echo "Checking environment variables" -require_env_vars CURRENT_PATH SERVICE DB_HOST DB_USER DB - -cd "$CURRENT_PATH" - -echo "Stopping unicorn and delayed job..." -service "$SERVICE" stop -RAILS_ENV=staging script/delayed_job -i 0 stop - -echo "Backing up current data..." -mkdir -p db/backup -pg_dump -h "$DB_HOST" -U "$DB_USER" "$DB" |gzip > db/backup/staging-`date +%Y%m%d%H%M%S`.sql.gz - -echo "Loading baseline data..." -drop_and_recreate_database "$DB" -U "$DB_USER" -gunzip -c db/backup/staging-baseline.sql.gz |psql -h "$DB_HOST" -U "$DB_USER" "$DB" - -echo "Restarting unicorn..." -service "$SERVICE" start -# Delayed job is restarted by monit - -echo "Done!" diff --git a/script/delayed_job b/script/delayed_job deleted file mode 100755 index cecd9acddd..0000000000 --- a/script/delayed_job +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env ruby - -require_relative '../config/environment' -require 'delayed/command' -Delayed::Command.new(ARGV).daemonize diff --git a/script/enqueue b/script/enqueue deleted file mode 100755 index 165774b878..0000000000 --- a/script/enqueue +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env ruby - -# Push a job onto the Delayed Job queue without booting the Rails stack -# Perfect for calling via cron. -# -# Use like this: -# -# ./script/enqueue -# ./script/enqueue Background::ImportJobs - -require 'erb' -require 'yaml' - -ENV["RAILS_ENV"] ||= "development" - -DATABASE_CONFIG = File.expand_path("../../config/database.yml", __FILE__) - -def psql - raise "Missing database.yml" unless File.exists?(DATABASE_CONFIG) - - file = File.read(DATABASE_CONFIG) - erb = ERB.new(file).result - env = ENV["RAILS_ENV"] - config = YAML.load(erb)[env] - - raise "Missing config for #{env} environment" unless config - - "psql".tap do |s| - s << " --quiet" - s << " --host #{config['host']}" if config['host'] - s << " --user #{config['username']}" if config['username'] - s << " --port #{config['port']}" if config['port'] - s << " #{config['database']}" - end -end - -def enqueue_delayed_job(handler, priority=nil) - time = Time.now.utc.strftime("%Y-%m-%d %H:%M:%S") - priority ||= 50 - - sql = <<-SQL - INSERT INTO delayed_jobs ( - handler, - created_at, - updated_at, - run_at, - priority - ) VALUES ( - '--- !ruby/object:#{handler} {}\n', - '#{time}', - '#{time}', - '#{time}', - #{priority} - ); - SQL - - IO.popen(psql, "w") do |io| - io.write sql - end -end - -enqueue_delayed_job ARGV[0], ARGV[1]