Merge branch 'chore/db_configs' into live

config/application.rb

@@ -47,7 +47,8 @@ module Akkounts
       g.stylesheets         false
     end
 
-    config.active_job.queue_adapter = :sidekiq
+    config.active_job.queue_adapter = :solid_queue
+    config.mission_control.jobs.http_basic_auth_enabled = false
 
     config.action_mailer.deliver_later_queue_name = nil # use "default" queue
 

config/credentials.yml.enc

@@ -1 +1 @@
-tmI5vm7qZhaigr52jEBVWkRdj+EE+9OmPh3vWXC7kA/OHuuucpr7SodychuMkQDPLM0BLk88LFsqvRIR+mqnLWpRC+P9aeUFE6ohxSWzcAd7Y4sgxUD8zpCRPndrwTw0hxXXj1WZSYeWn4BoAB34aV+gYen2MajZF3a95hJGtS5yjgWxvLVkQQKqRDfykkfX6fCS0BPo5X7sT7m4xwCATD/D4219wajm5W3TIdkriHtwt28ZLspaRWA5e0UkzKf8+/Gaj2CrW7UWcvew8R93zQ5RA2/Sp3sDTVN+kLz9I9Q095lQC0ywCAEFYHeKmc2tjrzqRaAAWu06xmWLqGIg21G+A/UU9lUJOkIpxQACWoOfS2IoXR1nXhgXMopkz3aCBXDxKw554v4H2QyOceOsuRf2C685ibMqzQkKMmJ4tcbiOJL77DUc08JTjB8Dq4Ohr8sMzXbV/hATevjYoRP0XarLekqhLv90ZLuIVY16DwB0CzACeNBKeKbeLqJF51upRRWgi+gTbYpV04yUwnXdyssF8mydWocgihrTryBi8F6PsuhBGcaYdP+0yibnGxDCC4x2rupbBfMj2OIX7pYzgtIHB3Eo954Y+bCoggqbE/Qrb9VVXNMgtKgLt8EGWU2tg6wl9QicitIq87uLDAade93zTn6rmcKPywjMDo6jbVIs653ZdUhiKdHGdpnJccbgQ/iLSPB1umNnCeaEX5jM+K9zBvl7ZMCdSk1YIQ==--ekKumqLiSlVJNwMe--K/ecXmmMT1x+WnIXMbHBDw==
+zaTF2ZJaU/M9CYmXEJoDmS1oniSV/1YT0UnM1jysEhMknn3bYOzRBZM3eGJ5Mr6bJYz6cv5hSDL5pT0/6hqgpV04dc/fVDplWO4eEpD1kBFM3LjIPCe9REbRlRUwODpoV/y6wWOFme8nFMS9uOSFkL6RtMuQli0os5Rp+2Jal2lJwAujFjFwuuj+1iRzqc3pzeIIy0clPmR9ANxXS+rPL3jmxty6QzVMr9Q658roVD38yRg0CNgs09eZ/FvqeqXlQkwDfg2/zX9tg5ocGwvHzmicZJ/yU6kl6liqNAJvEDrolm0gSzemY8NfhCySd5wjEvpP+uvKxbd5M3rhagC8S9MmpmxewuOKbDFEyTSRO6Kp2yakdcLSn12ZPB+X0nlMRno+UEzh0EvcX2mxRXppIKrsRUGVeYmj4GMI0vyLW1eCuyPLueN7sOnSjhtM84URNWkSnb0LTxlYxOJGbnwzn85QVpFdXtDktbaXvMWcVdH9XdMDbaBs1G7BIA6Z8i+mxLVVEbQWQM6VBrUhpkpWfphLmN5b16LYbGTzdKnR0iPcsNr8Tsl8vYfeWH8S0ujD105lS39v37YimN6E5l4X2CrqG+DNBtKfbqC0E3lhZMqDRWetxzaxE47oe4g=--0EKrvwe2YTfsbssz--SbmUH0sMiy5uUhpxFImgMA==

config/database.yml

@@ -1,21 +1,37 @@
 default: &default
-  adapter: sqlite3
+  adapter: <%= ENV["DB_ADAPTER"] || "sqlite3" %>
   pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %>
   timeout: 5000
+<% if ENV["DB_ADAPTER"] == "postgresql" %>
+  host: <%= ENV["PG_HOST"] || 'localhost' %>
+  port: <%= ENV["PG_PORT"] || 5432 %>
+  username: <%= ENV["PG_USERNAME"] || 'akkounts' %>
+  password: <%= ENV["PG_PASSWORD"] %>
+<% end %>
+
+<% if ENV["LNDHUB_PG_HOST"].present? %>
+lndhub: &lndhub
+  adapter: postgresql
+  database_tasks: false
+  host: <%= ENV["LNDHUB_PG_HOST"] %>
+  port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
+  database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
+  username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
+  password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
+<% end %>
 
 development:
   primary:
     <<: *default
-    database: db/development.sqlite3
-  lndhub:
+    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE"] : "db/development.sqlite3" %>
+  queue:
     <<: *default
-    adapter: postgresql
-    database_tasks: false
-    host: <%= ENV["LNDHUB_PG_HOST"] || 'localhost' %>
-    port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
-    database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
-    username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
-    password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
+    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE_QUEUE"] : "db/development_queue.sqlite3" %>
+    migrations_paths: db/queue_migrate
+<% if ENV["LNDHUB_PG_HOST"].present? %>
+  lndhub:
+    <<: *lndhub
+<% end %>
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
@@ -32,18 +48,12 @@ test:
 production:
   primary:
     <<: *default
-    adapter: postgresql
-    database: akkounts
-    port: 5432
-    host: <%= Rails.application.credentials.postgres[:host] rescue nil %>
-    username: <%= Rails.application.credentials.postgres[:username] rescue nil %>
-    password: <%= Rails.application.credentials.postgres[:password] rescue nil %>
-  lndhub:
+    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE"] : "db/production.sqlite3" %>
+  queue:
     <<: *default
-    adapter: postgresql
-    database_tasks: false
-    host: <%= ENV["LNDHUB_PG_HOST"] || 'localhost' %>
-    port: <%= ENV["LNDHUB_PG_PORT"] || 5432 %>
-    database: <%= ENV["LNDHUB_PG_DATABASE"] || 'lndhub' %>
-    username: <%= ENV["LNDHUB_PG_USERNAME"] || 'lndhub' %>
-    password: <%= ENV["LNDHUB_PG_PASSWORD"] %>
+    database: <%= ENV["DB_ADAPTER"] == "postgresql" ? ENV["PG_DATABASE_QUEUE"] : "db/production_queue.sqlite3" %>
+    migrations_paths: db/queue_migrate
+<% if ENV["LNDHUB_PG_HOST"].present? %>
+  lndhub:
+    <<: *lndhub
+<% end %>

config/environments/development.rb

@@ -54,6 +54,9 @@ Rails.application.configure do
   # Highlight code that enqueued background job in logs.
   config.active_job.verbose_enqueue_logs = true
 
+  # Solid Queue database
+  config.solid_queue.connects_to = { database: { writing: :queue } }
+
   # Suppress logger output for asset requests.
   # config.assets.quiet = true
 

config/environments/production.rb

@@ -54,8 +54,9 @@ Rails.application.configure do
   # 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
+  # Solid Queue database
+  config.solid_queue.connects_to = { database: { writing: :queue } }
+
   # E-mail settings, adapted from https://github.com/mastodon/mastodon
 
   outgoing_email_address = ENV.fetch('SMTP_FROM_ADDRESS', 'accounts@localhost')

config/initializers/devise_rails8_patch.rb

@@ -0,0 +1,11 @@
+# See https://alvincrespo.hashnode.dev/rails-8s-lazy-route-loading-devise
+# TODO remove when Devise is fixed
+require 'devise'
+Devise # make sure it's already loaded
+
+module Devise
+  def self.mappings
+    Rails.application.try(:reload_routes_unless_loaded)
+    @@mappings
+  end
+end

config/initializers/sidekiq.rb

@@ -1,5 +0,0 @@
-require_relative "../../app/models/setting"
-
-Sidekiq.configure_server do |config|
-  config.redis = { url: Setting.redis_url }
-end

config/queue.yml

@@ -0,0 +1,21 @@
+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
+  workers:
+    - queues: "*"
+      threads: 1
+
+test:
+  <<: *default
+
+production:
+  <<: *default

config/recurring.yml

@@ -0,0 +1,10 @@
+# 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

config/routes.rb

@@ -1,5 +1,3 @@
-require 'sidekiq/web'
-
 Rails.application.routes.draw do
   devise_for :users, controllers: {
     confirmations: 'users/confirmations',
@@ -123,7 +121,7 @@ Rails.application.routes.draw do
   end
 
   authenticate :user, ->(user) { user.is_admin? } do
-    mount Sidekiq::Web, at: '/sidekiq'
+    mount MissionControl::Jobs::Engine, at: "/jobs"
     mount Flipper::UI.app(Flipper), at: '/flipper'
   end