fix: solve database pooling issue

Author: Bulletdev

Dockerfile.dev

@@ -5,7 +5,7 @@ WORKDIR /rails
 
 RUN apt-get update -qq && \
     apt-get install --no-install-recommends -y \
-      build-essential curl git libyaml-dev pkg-config \
+      build-essential curl git libyaml-dev pkg-config libpq-dev \
       libsqlite3-dev libsqlite3-0 nodejs && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
@@ -18,4 +18,4 @@ RUN bundle install
 COPY . .
 
 EXPOSE 3001
-CMD ["sh", "-c", "bin/rails db:migrate 2>/dev/null; bin/rails server -p 3001 -b 0.0.0.0"]
+CMD ["sh", "-c", "rm -f tmp/pids/server.pid && bin/rails db:prepare 2>/dev/null && bin/rails leaguepedia:bootstrap 2>/dev/null || true && bin/rails server -p 3001 -b 0.0.0.0"]

Gemfile

@@ -49,6 +49,7 @@ group :development do
 end
 
 gem "sqlite3", ">= 2.1"
+gem "pg", "~> 1.5"
 gem "solid_queue", "~> 1.1"
 
 gem "faraday", "~> 2.14"

Gemfile.lock

@@ -201,6 +201,11 @@ GEM
     parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
+    pg (1.6.3)
+    pg (1.6.3-aarch64-linux)
+    pg (1.6.3-aarch64-linux-musl)
+    pg (1.6.3-x86_64-linux)
+    pg (1.6.3-x86_64-linux-musl)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
@@ -379,6 +384,7 @@ DEPENDENCIES
   kamal
   meta-tags (~> 2.22)
   oj (~> 3.16)
+  pg (~> 1.5)
   propshaft
   puma (>= 5.0)
   rails (~> 8.0.4)

app/models/leaguepedia_record.rb

@@ -0,0 +1,7 @@
+class LeaguepediaRecord < ApplicationRecord
+  self.abstract_class = true
+
+  if ActiveRecord::Base.configurations.find_db_config("leaguepedia")
+    connects_to database: { writing: :leaguepedia, reading: :leaguepedia }
+  end
+end

app/models/lp_champion_stat.rb

@@ -1,4 +1,4 @@
-class LpChampionStat < ApplicationRecord
+class LpChampionStat < LeaguepediaRecord
   scope :for_tournament, ->(t) { where(tournament: t) }
 
   def as_leaguepedia_hash

app/models/lp_game.rb

@@ -1,4 +1,4 @@
-class LpGame < ApplicationRecord
+class LpGame < LeaguepediaRecord
   scope :for_tournament, ->(t) { where(tournament: t) }
   scope :ordered,        -> { order(:datetime_utc) }
 

app/models/lp_match.rb

@@ -1,4 +1,4 @@
-class LpMatch < ApplicationRecord
+class LpMatch < LeaguepediaRecord
   scope :for_overview, ->(page) { where(overview_page: page) }
   scope :played,       -> { where.not(winner: [ nil, "" ]) }
   scope :upcoming,     -> { where(winner: [ nil, "" ]) }

app/models/lp_player.rb

@@ -1,4 +1,4 @@
-class LpPlayer < ApplicationRecord
+class LpPlayer < LeaguepediaRecord
   scope :for_tournament, ->(t) { where(tournament: t) }
   scope :for_player,     ->(slug) { where(player_link: slug) }
 

config/database.yml

@@ -10,6 +10,12 @@ development:
   queue:
     <<: *default
     database: storage/development.sqlite3
+<% if ENV["DATABASE_URL"].present? %>
+  leaguepedia:
+    adapter: postgresql
+    pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+    url: <%= ENV["DATABASE_URL"] %>
+<% end %>
 
 test:
   <<: *default
@@ -22,3 +28,9 @@ production:
   queue:
     <<: *default
     database: storage/production.sqlite3
+<% if ENV["DATABASE_URL"].present? %>
+  leaguepedia:
+    adapter: postgresql
+    pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+    url: <%= ENV["DATABASE_URL"] %>
+<% end %>

db/queue_schema.rb

@@ -218,7 +218,6 @@
     t.index ["key"], name: "index_solid_queue_semaphores_on_key", unique: true
   end
 
-  add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
   add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
   add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
   add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade