Skip to content

Commit

Permalink
fix procfile
Browse files Browse the repository at this point in the history
  • Loading branch information
annbelievable committed Apr 21, 2017
1 parent b896959 commit 6a6916e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ gem 'mini_magick'
gem "fog-aws"
gem "letter_opener", group: :development
gem 'sidekiq'
gem 'foreman'
gem 'unicorn'
# gem 'foreman'
# gem 'unicorn'
gem 'rails_12factor', group: :production

# frontend gems
Expand Down
9 changes: 0 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,6 @@ GEM
fog-xml (0.1.3)
fog-core
nokogiri (>= 1.5.11, < 2.0.0)
foreman (0.84.0)
thor (~> 0.19.1)
formatador (0.2.5)
geocoder (1.4.3)
globalid (0.4.0)
Expand All @@ -107,7 +105,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
kgio (2.11.0)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.4.1)
Expand Down Expand Up @@ -170,7 +167,6 @@ GEM
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.18.0)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.8)
Expand Down Expand Up @@ -212,9 +208,6 @@ GEM
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
unicorn (5.3.0)
kgio (~> 2.6)
raindrops (~> 0.7)
warden (1.2.7)
rack (>= 1.0)
web-console (3.5.0)
Expand All @@ -238,7 +231,6 @@ DEPENDENCIES
devise
figaro
fog-aws
foreman
geocoder
jbuilder (~> 2.5)
jquery-rails
Expand All @@ -257,7 +249,6 @@ DEPENDENCIES
turbolinks (~> 5)
tzinfo-data
uglifier (>= 1.3.0)
unicorn
web-console (>= 3.3.0)

RUBY VERSION
Expand Down
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: bundle exec rails server thin -p $PORT -e $RACK_ENV
web: bundle exec puma -C config/puma.rb
8 changes: 4 additions & 4 deletions config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# you need to make sure to reconnect any threads in the `on_worker_boot`
# block.
#
# preload_app!
preload_app!

# The code in the `on_worker_boot` will be called if you are using
# clustered mode by specifying a number of `workers`. After each worker
Expand All @@ -39,9 +39,9 @@
# or connections that may have been created at application boot, Ruby
# cannot share connections between processes.
#
# on_worker_boot do
# ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
# end
on_worker_boot do
ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
end

# Allow puma to be restarted by `rails restart` command.
plugin :tmp_restart

0 comments on commit 6a6916e

Please sign in to comment.