mirror of
https://github.com/jcwimer/wrestlingApp
synced 2026-03-25 01:14:43 +00:00
Upgraded to rails 8.0.2, moved from dalli to solid cache, moved from delayed_job to solid queue, and add solid cable. deploy/rails-dev-run.sh no longer needs to chmod. Fixed finished_at callback for matches. Migrated from Devise to built in rails auth. Added view tests for the bracket page testing that all bout numbers render for all matches in each bracket type.
This commit is contained in:
@@ -3,34 +3,84 @@
|
||||
#
|
||||
# Ensure the SQLite 3 gem is defined in your Gemfile
|
||||
# gem 'sqlite3'
|
||||
development:
|
||||
|
||||
default: &default
|
||||
adapter: sqlite3
|
||||
database: db/development.sqlite3
|
||||
pool: 5
|
||||
pool: <%=
|
||||
if ENV["DATABASE_POOL_SIZE"].present?
|
||||
ENV["DATABASE_POOL_SIZE"]
|
||||
else
|
||||
# Calculate based on max threads and estimated workers
|
||||
# Default to threads*workers or at least 5 connections
|
||||
max_threads = ENV.fetch("RAILS_MAX_THREADS", 12).to_i
|
||||
workers = ENV.fetch("WEB_CONCURRENCY", 2).to_i
|
||||
[max_threads * workers, 5].max
|
||||
end
|
||||
%>
|
||||
timeout: 5000
|
||||
|
||||
|
||||
#adapter: mysql
|
||||
#encoding: utf8
|
||||
#database: wrestlingtourney
|
||||
#pool: 5
|
||||
#username: root
|
||||
#password: password
|
||||
development:
|
||||
primary:
|
||||
<<: *default
|
||||
database: db/development.sqlite3
|
||||
queue:
|
||||
<<: *default
|
||||
database: db/development-queue.sqlite3
|
||||
cache:
|
||||
<<: *default
|
||||
database: db/development-cache.sqlite3
|
||||
cable:
|
||||
<<: *default
|
||||
database: db/development-cable.sqlite3
|
||||
|
||||
# Warning: The database defined as "test" will be erased and
|
||||
# re-generated from your development database when you run "rake".
|
||||
# Do not set this db to the same as development or production.
|
||||
test:
|
||||
adapter: sqlite3
|
||||
database: db/test.sqlite3
|
||||
pool: 5
|
||||
timeout: 5000
|
||||
primary:
|
||||
<<: *default
|
||||
database: db/test.sqlite3
|
||||
queue:
|
||||
<<: *default
|
||||
database: db/test-queue.sqlite3
|
||||
cache:
|
||||
<<: *default
|
||||
database: db/test-cache.sqlite3
|
||||
cable:
|
||||
<<: *default
|
||||
database: db/test-cable.sqlite3
|
||||
|
||||
production:
|
||||
adapter: mysql2
|
||||
encoding: utf8
|
||||
database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>
|
||||
username: <%= ENV['WRESTLINGDEV_DB_USR'] %>
|
||||
password: <%= ENV['WRESTLINGDEV_DB_PWD'] %>
|
||||
host: <%= ENV['WRESTLINGDEV_DB_HOST'] %>
|
||||
port: <%= ENV['WRESTLINGDEV_DB_PORT'] %>
|
||||
primary:
|
||||
adapter: mysql2
|
||||
encoding: utf8
|
||||
database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>
|
||||
username: <%= ENV['WRESTLINGDEV_DB_USR'] %>
|
||||
password: <%= ENV['WRESTLINGDEV_DB_PWD'] %>
|
||||
host: <%= ENV['WRESTLINGDEV_DB_HOST'] %>
|
||||
port: <%= ENV['WRESTLINGDEV_DB_PORT'] %>
|
||||
queue:
|
||||
adapter: mysql2
|
||||
encoding: utf8
|
||||
database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>-queue
|
||||
username: <%= ENV['WRESTLINGDEV_DB_USR'] %>
|
||||
password: <%= ENV['WRESTLINGDEV_DB_PWD'] %>
|
||||
host: <%= ENV['WRESTLINGDEV_DB_HOST'] %>
|
||||
port: <%= ENV['WRESTLINGDEV_DB_PORT'] %>
|
||||
cache:
|
||||
adapter: mysql2
|
||||
encoding: utf8
|
||||
database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>-cache
|
||||
username: <%= ENV['WRESTLINGDEV_DB_USR'] %>
|
||||
password: <%= ENV['WRESTLINGDEV_DB_PWD'] %>
|
||||
host: <%= ENV['WRESTLINGDEV_DB_HOST'] %>
|
||||
port: <%= ENV['WRESTLINGDEV_DB_PORT'] %>
|
||||
cable:
|
||||
adapter: mysql2
|
||||
encoding: utf8
|
||||
database: <%= ENV['WRESTLINGDEV_DB_NAME'] %>-cable
|
||||
username: <%= ENV['WRESTLINGDEV_DB_USR'] %>
|
||||
password: <%= ENV['WRESTLINGDEV_DB_PWD'] %>
|
||||
host: <%= ENV['WRESTLINGDEV_DB_HOST'] %>
|
||||
port: <%= ENV['WRESTLINGDEV_DB_PORT'] %>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user