File tree 5 files changed +19
-33
lines changed
5 files changed +19
-33
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ group :production do
12
12
# Pg is used for Heroku
13
13
gem "pg"
14
14
gem "rails_12factor" # Never include this for development or tests
15
+ gem "puma"
15
16
end
16
17
17
18
# Use SCSS for stylesheets
@@ -37,9 +38,6 @@ gem "sdoc", group: :doc
37
38
# Use Rails Html Sanitizer for HTML sanitization
38
39
gem "rails-html-sanitizer"
39
40
40
- # Use Unicorn as the app server
41
- gem "unicorn"
42
-
43
41
gem "react_on_rails"
44
42
45
43
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
Original file line number Diff line number Diff line change 130
130
activesupport (>= 3.0.0 , < 5 )
131
131
multi_json (~> 1.2 )
132
132
json (1.8.3 )
133
- kgio (2.10.0 )
134
133
launchy (2.4.3 )
135
134
addressable (~> 2.3 )
136
135
libv8 (3.16.14.13 )
168
167
pry-stack_explorer (0.4.9.2 )
169
168
binding_of_caller (>= 0.7 )
170
169
pry (>= 0.9.11 )
170
+ puma (2.15.3 )
171
171
rack (1.6.4 )
172
172
rack-test (0.6.3 )
173
173
rack (>= 1.0 )
201
201
rake (>= 0.8.7 )
202
202
thor (>= 0.18.1 , < 2.0 )
203
203
rainbow (2.0.0 )
204
- raindrops (0.15.0 )
205
204
rake (10.4.2 )
206
205
rdoc (4.2.0 )
207
206
react_on_rails (1.1.0 )
307
306
unf (0.1.4 )
308
307
unf_ext
309
308
unf_ext (0.0.7.1 )
310
- unicorn (5.0.1 )
311
- kgio (~> 2.6 )
312
- rack
313
- raindrops (~> 0.7 )
314
309
web-console (2.2.1 )
315
310
activemodel (>= 4.0 )
316
311
binding_of_caller (>= 0.7.2 )
@@ -347,6 +342,7 @@ DEPENDENCIES
347
342
pry-rails
348
343
pry-rescue
349
344
pry-stack_explorer
345
+ puma
350
346
rails (~> 4.2 )
351
347
rails-html-sanitizer
352
348
rails_12factor
@@ -364,7 +360,6 @@ DEPENDENCIES
364
360
therubyracer
365
361
turbolinks
366
362
uglifier
367
- unicorn
368
363
web-console
369
364
370
365
BUNDLED WITH
Original file line number Diff line number Diff line change 1
- web : bundle exec unicorn -p $PORT -c ./ config/unicorn .rb
1
+ web : bundle exec puma -C config/puma .rb
Original file line number Diff line number Diff line change
1
+ workers Integer ( ENV [ "WEB_CONCURRENCY" ] || 2 )
2
+ threads_count = Integer ( ENV [ "MAX_THREADS" ] || 5 )
3
+ threads threads_count , threads_count
4
+
5
+ preload_app!
6
+
7
+ rackup DefaultRackup
8
+ port ENV [ "PORT" ] || 3000
9
+ environment ENV [ "RACK_ENV" ] || "development"
10
+
11
+ on_worker_boot do
12
+ # Worker specific setup for Rails 4.1+
13
+ # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
14
+ ActiveRecord ::Base . establish_connection
15
+ end
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments