Feature/solid queue

.rubocop.yml

@@ -73,7 +73,6 @@ Style/GlobalVars:
   Exclude:
     - "app/services/cache_store_config_service.rb"
     - "config/initializers/redis.rb"
-    - "config/initializers/sidekiq.rb"
 
 Style/SymbolProc:
   Enabled: false

Gemfile

@@ -49,9 +49,8 @@ gem 'redis'
 gem 'responders'
 gem 'rqrcode'
 gem 'rubyzip'
-gem 'sidekiq'
-gem 'sidekiq-cron'
 gem 'slim-rails'
+gem 'solid_queue'
 gem 'stackprof'
 gem 'statesman'
 gem 'store_model'

Gemfile.lock

@@ -147,9 +147,6 @@ GEM
     country_select (10.0.1)
       countries (> 5.0, < 8.0)
     crass (1.0.6)
-    cronex (0.15.0)
-      tzinfo
-      unicode (>= 0.4.4.5)
     csv (3.3.2)
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
@@ -493,16 +490,6 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sidekiq (7.3.7)
-      connection_pool (>= 2.3.0)
-      logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
-    sidekiq-cron (2.0.1)
-      cronex (>= 0.13.0)
-      fugit (~> 1.8, >= 1.11.1)
-      globalid (>= 1.0.1)
-      sidekiq (>= 6.5.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -518,6 +505,13 @@ GEM
       actionpack (>= 3.1)
       railties (>= 3.1)
       slim (>= 3.0, < 6.0, != 5.0.0)
+    solid_queue (1.1.2)
+      activejob (>= 7.1)
+      activerecord (>= 7.1)
+      concurrent-ruby (>= 1.3.1)
+      fugit (~> 1.11.0)
+      railties (>= 7.1)
+      thor (~> 1.3.1)
     sorbet-runtime (0.5.11755)
     squasher (0.8.0)
     stackprof (0.2.26)
@@ -540,7 +534,6 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unaccent (0.4.0)
-    unicode (0.4.4.5)
     unicode-display_width (3.1.4)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
@@ -637,10 +630,9 @@ DEPENDENCIES
   ruby-lsp-rails
   rubyzip
   selenium-webdriver
-  sidekiq
-  sidekiq-cron
   simplecov
   slim-rails
+  solid_queue
   squasher
   stackprof
   statesman

README.md

@@ -18,7 +18,7 @@ Then inside the container you may run:
 
 - `bin/rails-dev-server` to start rails server
 - `bin/vite dev` to start vite dev server
-- `bin/sidekiq-job-worker` to start the sidekiq worker process
+- `bin/jobs` to start the active job worker process
 
 To visit the automatically created default organization, visit <http://heimv.localhost:3000/>.
 

app/jobs/mail_delivery_job.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 class MailDeliveryJob < ActionMailer::MailDeliveryJob
-  retry_on Net::SMTPFatalError,
-           Net::SMTPAuthenticationError,
-           Net::ReadTimeout,
-           ActiveJob::DeserializationError,
-           Errno::ECONNREFUSED,
+  retry_on Net::SMTPFatalError, Net::SMTPAuthenticationError, Net::ReadTimeout, ActiveJob::DeserializationError,
            wait: 30.seconds, attempts: 5
-  # discard_on ActiveJob::DeserializationError
-  sidekiq_options retry: 5
 end

app/jobs/plan_b_backup_job.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 class PlanBBackupJob < ApplicationJob
-  sidekiq_options retry: 0
   queue_as :default
 
   def perform(*args)

app/services/health_service.rb

@@ -1,20 +1,18 @@
 # frozen_string_literal: true
 
-require 'sidekiq/api'
-
 class HealthService
   def cache_ok?
-    Rails.cache.stats.present?
-  rescue StandardError => e
-    Rails.logger.error(e)
-    false
+    #   Rails.cache.stats.present?
+    # rescue StandardError => e
+    #   Rails.logger.error(e)
+    #   false
   end
 
   def jobs_ok?
-    !Sidekiq::Stats.new.queues.nil?
-  rescue StandardError => e
-    Rails.logger.error(e)
-    false
+    #   !Sidekiq::Stats.new.queues.nil?
+    # rescue StandardError => e
+    #   Rails.logger.error(e)
+    #   false
   end
 
   def db_ok?
@@ -27,8 +25,8 @@ def db_ok?
 
   def to_h
     {
-      cache: cache_ok?,
-      jobs: jobs_ok?,
+      # cache: cache_ok?,
+      # jobs: jobs_ok?,
       db: db_ok?
     }
   end

bin/jobs

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require_relative "../config/environment"
+require "solid_queue/cli"
+
+SolidQueue::Cli.start(ARGV)

bin/rails-worker

@@ -0,0 +1,2 @@
+#!/bin/sh
+bundle exec rake solid_queue:start

config/application.rb

@@ -42,7 +42,7 @@ class Application < Rails::Application
     # Don't generate system test files.
     config.generators.system_tests = nil
 
-    config.active_job.queue_adapter = ENV.fetch('ACTIVE_JOB_QUEUE_ADAPTER', :inline)
+    config.active_job.queue_adapter = :solid_queue
 
     config.redis_config = { url: ENV.fetch('REDIS_URL', nil), ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE } }
 

config/environments/production.rb

@@ -53,11 +53,15 @@
 
   # Replace the default in-process memory cache store with a durable alternative.
   # config.cache_store = :mem_cache_store
-
-  # Replace the default in-process and non-durable queuing backend for Active Job.
-  # config.active_job.queue_adapter = :resque
   config.cache_store = CacheStoreFactory.redis(config.redis_config)
 
+  # Use a real queuing backend for Active Job (and separate queues per environment).
+  # config.active_job.queue_name_prefix = "heimverwaltung_production"
+  config.active_job.queue_adapter = :solid_queue
+  # config.solid_queue.connects_to = { database: { writing: :queue } }
+
+  config.action_mailer.perform_caching = false
+
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   config.action_mailer.raise_delivery_errors = true

config/initializers/exception_notification.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 if defined?(ExceptionNotification)
-  require 'exception_notification/sidekiq'
-
   Rails.application.config.middleware.use ExceptionNotification::Rack,
                                           email: {
                                             sender_address: ENV.fetch('MAIL_FROM', nil),

config/queue.yml

@@ -0,0 +1,18 @@
+# default: &default
+#   dispatchers:
+#     - polling_interval: 1
+#       batch_size: 500
+#   workers:
+#     - queues: "*"
+#       threads: 3
+#       processes: <%= ENV.fetch("JOB_CONCURRENCY", 1) %>
+#       polling_interval: 0.1
+
+# development:
+#   <<: *default
+
+# test:
+#   <<: *default
+
+# production:
+#   <<: *default

config/recurring.yml

@@ -0,0 +1,31 @@
+# production:
+#   periodic_cleanup:
+#     class: CleanSoftDeletedRecordsJob
+#     queue: background
+#     args: [ 1000, { batch_size: 500 } ]
+#     schedule: every hour
+#   periodic_command:
+#     command: "SoftDeletedRecord.due.delete_all"
+#     priority: 2
+#     schedule: at 5am every day
+
+development:
+  transition_booking_states:
+    schedule: "0 * * * *"
+    class: TransitionBookingStatesJob
+
+# test:
+#   <<: *default
+
+production:
+  transition_booking_states:
+    schedule: "*/5 * * * *"
+    class: TransitionBookingStatesJob
+
+  clean_data_digests:
+    schedule: "0 3 * * *"
+    class: CleanDataDigestsJob
+
+  schedule_plan_b_backups:
+    schedule: "0 2 * * *"
+    class: SchedulePlanBBackupsJob

config/solid_queue.yml

@@ -0,0 +1,18 @@
+#default: &default
+#   dispatchers:
+#     - polling_interval: 1
+#       batch_size: 500
+#   workers:
+#     - queues: "*"
+#       threads: 5
+#       processes: 1
+#       polling_interval: 0.1
+#
+# development:
+#  <<: *default
+#
+# test:
+#  <<: *default
+#
+# production:
+#  <<: *default