Skip to content

Commit

Permalink
Merge pull request #15 from anewman15/main
Browse files Browse the repository at this point in the history
Quickfix
  • Loading branch information
anewman15 authored Jan 29, 2021
2 parents b9b16b7 + 41b8389 commit d78c7f4
Show file tree
Hide file tree
Showing 5 changed files with 5,364 additions and 68 deletions.
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: bundle exec puma -C config/puma.rb
7 changes: 6 additions & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,9 @@ test:

production:
<<: *default
database: activize_production
database: <%= ENV['RDS_DB_NAME'] %>
username: <%= ENV['RDS_USERNAME'] %>
password: <%= ENV['RDS_PASSWORD'] %>
host: <%= ENV['RDS_HOSTNAME'] %>
host: <%= ENV['RDS_PORT'] %>

20 changes: 14 additions & 6 deletions config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@
min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
threads min_threads_count, max_threads_count


# Use the `preload_app!` method when specifying a `workers` number.
# This directive tells Puma to first boot the application and load code
# before forking the application. This takes advantage of Copy On Write
# process behavior so workers use less memory.
#
preload_app!

rackup DefaultRackup
# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
port ENV.fetch("PORT") { 3000 }
Expand All @@ -27,12 +36,11 @@
#
# workers ENV.fetch("WEB_CONCURRENCY") { 2 }

# Use the `preload_app!` method when specifying a `workers` number.
# This directive tells Puma to first boot the application and load code
# before forking the application. This takes advantage of Copy On Write
# process behavior so workers use less memory.
#
# preload_app!
on_worker_boot do
# Worker specific setup for Rails 4.1+
# See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
ActiveRecord::Base.establish_connection
end

# Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart
9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{
"name": "random_practice",
"name": "activize",
"private": true,
"engines": {
"yarn": "1.22.5"
},
"dependencies": {
"@rails/actioncable": "^6.0.0",
"@rails/activestorage": "^6.0.0",
"@rails/ujs": "^6.0.0",
"@rails/webpacker": "4.3.0",
"node-sass": "^4.14.1",
"turbolinks": "^5.2.0"
},
"version": "0.1.0",
"devDependencies": {
"webpack": "^4.0.0",
"webpack-cli": "^4.4.0",
"webpack-dev-server": "^3.11.0"
}
}
Loading

0 comments on commit d78c7f4

Please sign in to comment.