Merge pull request #2337 from internetee/2334-remove-que

Refactor: remove legacy que

.codeclimate.yml

@@ -48,7 +48,6 @@ exclude_patterns:
   - "config/"
   - "db/"
   - "lib/core_monkey_patches/"
-  - "lib/daemons/"
   - "lib/gem_monkey_patches/"
   - "lib/tasks/api_log.rake"
   - "lib/tasks/bootstrap.rake"

Gemfile

@@ -62,13 +62,10 @@ gem 'omniauth-tara', github: 'internetee/omniauth-tara'
 # gem 'omniauth-tara', path: 'vendor/gems/omniauth-tara'
 
 gem 'airbrake'
-gem 'daemons-rails', '1.2.1'
 gem 'epp', github: 'internetee/epp', branch: :master
 gem 'epp-xml', '1.2.0', github: 'internetee/epp-xml', branch: :master
 gem 'jquery-ui-rails', '6.0.1'
 gem 'pdfkit'
-gem 'que'
-gem 'que-web'
 gem 'sidekiq', '>= 6.4.1'
 
 gem 'company_register', github: 'internetee/company_register',

Gemfile.lock

@@ -202,10 +202,6 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
-    daemons (1.3.1)
-    daemons-rails (1.2.1)
-      daemons
-      multi_json (~> 1.0)
     data_migrate (8.0.0)
       activerecord (>= 5.0)
       railties (>= 5.0)
@@ -227,7 +223,6 @@ GEM
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     erubi (1.10.0)
-    erubis (2.7.0)
     execjs (2.7.0)
     ffi (1.15.0)
     figaro (1.2.0)
@@ -318,9 +313,6 @@ GEM
       money (~> 6.13.2)
       railties (>= 3.0)
     msgpack (1.4.2)
-    multi_json (1.15.0)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
     newrelic-infinite_tracing (8.1.0)
       grpc (~> 1.34)
@@ -365,11 +357,6 @@ GEM
     public_suffix (4.0.6)
     puma (5.6.4)
       nio4r (~> 2.0)
-    que (0.14.3)
-    que-web (0.7.2)
-      erubis
-      que (~> 0.8)
-      sinatra
     racc (1.6.0)
     rack (2.2.4)
     rack-oauth2 (1.16.0)
@@ -546,7 +533,6 @@ DEPENDENCIES
   coffee-rails (>= 5.0)
   company_register!
   countries
-  daemons-rails (= 1.2.1)
   data_migrate (~> 8.0)
   database_cleaner
   devise (~> 4.8)
@@ -582,8 +568,6 @@ DEPENDENCIES
   pghero
   pry (= 0.14.1)
   puma
-  que
-  que-web
   rails (~> 6.1.4)
   ransack (~> 2.6.0)
   rest-client

README.md

@@ -390,7 +390,6 @@ sudo apt-get install libxext-dev libxrender1 fontconfig
 ### Deployment
 
 * [Application build and update](/doc/application_build_doc.md)
-* [Registry que server](/doc/que/README.md)
 
 ### Autotesting
 

app/views/admin/base/_menu.haml

@@ -39,7 +39,6 @@
           %li= link_to t('.bounced_email_addresses'), admin_bounced_mail_addresses_path
           %li= link_to t('.epp_log'), admin_epp_logs_path(created_after: 'today')
           %li= link_to t('.repp_log'), admin_repp_logs_path(created_after: 'today')
-          %li= link_to t('.que'), '/admin/que'
 
   %ul.nav.navbar-nav.navbar-right
     %li= link_to t('.sign_out'), destroy_admin_user_session_path, method: :delete,

config.ru

@@ -2,12 +2,3 @@
 
 require_relative 'config/environment'
 run Rails.application
-
-# turn automatic que temp off
-# if defined?(PhusionPassenger)
-  # PhusionPassenger.on_event(:starting_worker_process) do |forked|
-    # if forked
-      # Que.mode = :async
-    # end
-  # end
-# end

config/deploy.rb.sample

@@ -15,7 +15,6 @@ set :deploy_to, '$HOME/registry'
 set :repository, 'https://github.com/domify/registry' # dev repo
 set :branch, 'master'
 set :rails_env, 'alpha'
-set :que_restart, true
 set :cron_group, 'registry'
 
 # alpha branch, only use for heavy debugging
@@ -25,7 +24,6 @@ task :epp do
   set :repository, 'https://github.com/domify/registry' # dev repo
   set :branch, 'master'
   set :rails_env, 'alpha'
-  set :que_restart, false
 end
 
 # alpha branch, only use for heavy debugging
@@ -35,7 +33,6 @@ task :registrar do
   set :repository, 'https://github.com/domify/registry' # dev repo
   set :branch, 'master'
   set :rails_env, 'alpha'
-  set :que_restart, false
   set :cron_group, 'registrar'
 end
 
@@ -46,7 +43,6 @@ task :registrant do
   set :repository, 'https://github.com/domify/registry' # dev repo
   set :branch, 'master'
   set :rails_env, 'alpha'
-  set :que_restart, false
   set :cron_group, 'registrant'
 end
 
@@ -57,7 +53,6 @@ task :st do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'staging'
   set :rails_env, 'staging'
-  set :que_restart, true
 end
 
 # staging
@@ -67,7 +62,6 @@ task :eppst do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'staging'
   set :rails_env, 'staging'
-  set :que_restart, false
   set :cron_group, 'epp'
 end
 
@@ -78,7 +72,6 @@ task :registrarst do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'staging'
   set :rails_env, 'staging'
-  set :que_restart, false
   set :cron_group, 'registrar'
 end
 
@@ -89,7 +82,6 @@ task :registrantst do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'staging'
   set :rails_env, 'staging'
-  set :que_restart, false
   set :cron_group, 'registrant'
 end
 
@@ -100,7 +92,6 @@ task :pr do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master'
   set :rails_env, 'production'
-  set :que_restart, true
 end
 
 # production
@@ -110,7 +101,6 @@ task :epppr do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master'
   set :rails_env, 'production'
-  set :que_restart, false
   set :cron_group, 'epp'
 end
 
@@ -121,7 +111,6 @@ task :registrarpr do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master'
   set :rails_env, 'production'
-  set :que_restart, false
   set :cron_group, 'registrar'
 end
 
@@ -132,7 +121,6 @@ task :registrantpr do
   set :repository, 'https://github.com/internetee/registry' # production repo
   set :branch, 'master'
   set :rails_env, 'production'
-  set :que_restart, false
   set :cron_group, 'registrant'
 end
 
@@ -193,9 +181,6 @@ task setup: :environment do
   queue! %(mkdir -p "#{deploy_to}/shared/import/legal_documents")
   queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/import/legal_documents")
 
-  queue! %(mkdir -p "#{deploy_to}/shared/log/que")
-  queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/log/que")
-
   queue! %(touch "#{deploy_to}/shared/config/database.yml")
   deploy do
     invoke :'git:clone'
@@ -217,8 +202,6 @@ task deploy: :environment do
     invoke :load_commit_hash
 
     # TEMP until all servers are updated
-    queue! %(mkdir -p "#{deploy_to}/shared/log/que")
-    queue! %(chmod g+rx,u+rwx "#{deploy_to}/shared/log/que")
 
     invoke :'deploy:link_shared_paths'
     invoke :'bundle:install'
@@ -233,7 +216,7 @@ task deploy: :environment do
   end
 end
 
-# data_migrate=some_data_migration mina deploy env 
+# data_migrate=some_data_migration mina deploy env
 desc 'Run data migrations if any set with ENV[data_migrate]'
 task data_migration: :environment do
         if ENV['data_migrate']
@@ -258,11 +241,6 @@ task restart: :environment do
   queue "mkdir -p #{deploy_to}/current/tmp; touch #{deploy_to}/current/tmp/restart.txt"
 end
 
-desc 'Restart que server'
-task que_restart: :environment do
-  queue "/etc/init.d/que restart"
-end
-
 namespace :cron do
   desc 'Setup cron tasks.'
   task setup: :environment do

config/locales/admin/menu.en.yml

@@ -19,4 +19,3 @@ en:
         mass_actions: Mass actions
         epp_log: EPP log
         repp_log: REPP log
-        que: Que

config/routes.rb

@@ -431,7 +431,6 @@
     resources :bounced_mail_addresses, only: %i[index show destroy]
 
     authenticate :admin_user do
-      mount Que::Web, at: 'que'
       mount Sidekiq::Web, at: 'sidekiq'
     end
   end

db/migrate/20150611124920_add_que.rb

@@ -1,11 +1,11 @@
 class AddQue < ActiveRecord::Migration[6.0]
   def self.up
     # The current version as of this migration's creation.
-    Que.migrate! :version => 3
+    # Que.migrate! :version => 3
   end
 
   def self.down
     # Completely removes Que's job queue.
-    Que.migrate! :version => 0
+    # Que.migrate! :version => 0
   end
 end

db/migrate/20220406085500_remove_que_jobs.rb

@@ -0,0 +1,5 @@
+class RemoveQueJobs < ActiveRecord::Migration[6.1]
+  def change
+    # drop_table :que_jobs
+  end
+end