use sidekiq

config/application.rb

@@ -19,7 +19,7 @@ module DocuSeal
   class Application < Rails::Application
     config.load_defaults 7.1
 
-    config.autoload_lib(ignore: %w[assets tasks])
+    config.autoload_lib(ignore: %w[assets tasks puma])
 
     config.active_storage.routes_prefix = ''
 

config/boot.rb

@@ -2,41 +2,7 @@
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
-if ENV['RAILS_ENV'] == 'production' && ENV['SECRET_KEY_BASE'].to_s.empty?
-  require 'dotenv'
-  require 'securerandom'
-
-  dotenv_path = "#{ENV.fetch('WORKDIR', '.')}/docuseal.env"
-
-  unless File.exist?(dotenv_path)
-    default_env = <<~TEXT
-      DATABASE_URL= # keep empty to use sqlite or specify postgresql database URL
-      SECRET_KEY_BASE=#{SecureRandom.hex(64)}
-    TEXT
-
-    File.write(dotenv_path, default_env)
-  end
-
-  database_url = ENV.fetch('DATABASE_URL', nil)
-
-  Dotenv.load(dotenv_path)
-
-  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].to_s.empty? ? database_url : ENV.fetch('DATABASE_URL', nil)
-end
-
-if ENV['DATABASE_URL'].to_s.split('@').last.to_s.split('/').first.to_s.include?('_')
-  require 'addressable'
-
-  url = Addressable::URI.parse(ENV.fetch('DATABASE_URL', ''))
-
-  ENV['DATABASE_HOST'] = url.host
-  ENV['DATABASE_PORT'] = (url.port || 5432).to_s
-  ENV['DATABASE_USER'] = url.user
-  ENV['DATABASE_PASSWORD'] = url.password
-  ENV['DATABASE_NAME'] = url.path.to_s.delete_prefix('/')
-
-  ENV.delete('DATABASE_URL')
-end
+require_relative 'dotenv'
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

config/database.yml

@@ -1,7 +1,7 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15) %>
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15).to_i + ENV.fetch('SIDEKIQ_THREADS', 5).to_i %>
 
 development:
   <<: *default
@@ -22,12 +22,14 @@ production:
 <% elsif ENV['DATABASE_URL'].to_s.empty? %>
   adapter: sqlite3
   database: <%= ENV['WORKDIR'] || '.' %>/db.sqlite3
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15).to_i + ENV.fetch('SIDEKIQ_THREADS', 5).to_i %>
+  timeout: 5000
 <% elsif ENV['DATABASE_URL'].match?(/\Apostgres/) %>
   <<: *default
   url: <%= ENV['DATABASE_URL'] %>
 <% elsif ENV['DATABASE_URL'].match?(/\Amysql/) %>
   adapter: mysql2
   encoding: utf8mb4
-  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15) %>
+  pool: <%= ENV.fetch('RAILS_MAX_THREADS', 15).to_i + ENV.fetch('SIDEKIQ_THREADS', 5).to_i %>
   url: <%= ENV['DATABASE_URL'] %>
 <% end %>

config/dotenv.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+if ENV['RAILS_ENV'] == 'production' && ENV['SECRET_KEY_BASE'].to_s.empty?
+  require 'dotenv'
+  require 'securerandom'
+
+  dotenv_path = "#{ENV.fetch('WORKDIR', '.')}/docuseal.env"
+
+  unless File.exist?(dotenv_path)
+    default_env = <<~TEXT
+      DATABASE_URL= # keep empty to use sqlite or specify postgresql database URL
+      SECRET_KEY_BASE=#{SecureRandom.hex(64)}
+    TEXT
+
+    File.write(dotenv_path, default_env)
+  end
+
+  database_url = ENV.fetch('DATABASE_URL', nil)
+
+  Dotenv.load(dotenv_path)
+
+  ENV['DATABASE_URL'] = ENV['DATABASE_URL'].to_s.empty? ? database_url : ENV.fetch('DATABASE_URL', nil)
+end
+
+if ENV['DATABASE_URL'].to_s.split('@').last.to_s.split('/').first.to_s.include?('_')
+  require 'addressable'
+
+  url = Addressable::URI.parse(ENV.fetch('DATABASE_URL', ''))
+
+  ENV['DATABASE_HOST'] = url.host
+  ENV['DATABASE_PORT'] = (url.port || 5432).to_s
+  ENV['DATABASE_USER'] = url.user
+  ENV['DATABASE_PASSWORD'] = url.password
+  ENV['DATABASE_NAME'] = url.path.to_s.delete_prefix('/')
+
+  ENV.delete('DATABASE_URL')
+end
+
+if ENV['REDIS_URL'].to_s.empty?
+  require 'digest'
+
+  redis_password = Digest::SHA1.hexdigest("redis#{ENV.fetch('SECRET_KEY_BASE', '')}")
+
+  ENV['REDIS_URL'] = "redis://default:#{redis_password}@0.0.0.0:6379/0"
+  ENV['LOCAL_REDIS_URL'] = ENV.fetch('REDIS_URL', nil)
+end

config/environments/development.rb

@@ -47,7 +47,7 @@ Rails.application.configure do
     config.cache_store = :null_store
   end
 
-  config.active_job.queue_adapter = :sidekiq if defined?(Sidekiq)
+  config.active_job.queue_adapter = :sidekiq
 
   # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :disk

config/environments/production.rb

@@ -27,7 +27,7 @@ Rails.application.configure do
   config.action_controller.perform_caching = true
   config.active_record.sqlite3_production_warning = false
 
-  config.active_job.queue_adapter = :sidekiq if defined?(Sidekiq)
+  config.active_job.queue_adapter = :sidekiq
 
   # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
   # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).

config/environments/test.rb

@@ -44,7 +44,7 @@ Rails.application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  config.active_job.queue_adapter = :test
+  config.active_job.queue_adapter = :sidekiq
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr

config/initializers/sidekiq.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-if defined?(Sidekiq)
-  require 'sidekiq/web'
+require 'sidekiq/web' if defined?(Puma)
 
+if !ENV['SIDEKIQ_BASIC_AUTH_PASSWORD'].to_s.empty? && defined?(Sidekiq::Web)
   Sidekiq::Web.use(Rack::Auth::Basic) do |_, password|
-    next true if Rails.env.development?
-
     ActiveSupport::SecurityUtils.secure_compare(
       Digest::SHA256.hexdigest(password),
       Digest::SHA256.hexdigest(ENV.fetch('SIDEKIQ_BASIC_AUTH_PASSWORD'))
     )
   end
-
-  Sidekiq.strict_args!
 end
+
+Sidekiq.strict_args!

config/puma.rb

@@ -5,7 +5,9 @@
 # Any libraries that use thread pools should be configured to match
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
-#
+
+require_relative 'dotenv'
+
 max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 15)
 min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
 threads min_threads_count, max_threads_count
@@ -41,5 +43,10 @@ workers ENV.fetch('WEB_CONCURRENCY', 0)
 #
 # preload_app!
 
-# Allow puma to be restarted by `bin/rails restart` command.
-plugin :tmp_restart
+if ENV['MULTITENANT'] != 'true' || ENV['DEMO'] == 'true'
+  require_relative '../lib/puma/plugin/redis_server'
+  require_relative '../lib/puma/plugin/sidekiq_embed'
+
+  plugin :sidekiq_embed
+  plugin :redis_server
+end

config/routes.rb

@@ -2,7 +2,12 @@
 
 Rails.application.routes.draw do
   mount LetterOpenerWeb::Engine, at: '/letter_opener' if Rails.env.development?
-  mount Sidekiq::Web => '/sidekiq' if defined?(Sidekiq)
+
+  if !Docuseal.multitenant? && defined?(Sidekiq::Web)
+    authenticated :user, ->(u) { u.sidekiq? } do
+      mount Sidekiq::Web => '/jobs'
+    end
+  end
 
   root 'dashboard#index'