Skip to content

Commit 9ddc682

Browse files
committed
Replace Unicorn with Puma
1 parent 75f7ff5 commit 9ddc682

File tree

5 files changed

+61
-30
lines changed

5 files changed

+61
-30
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ gem 'redis-rails'
99
gem 'faraday'
1010
gem 'faraday_middleware'
1111
gem 'octokit'
12+
gem 'puma'
1213
gem "pg", '0.21.0'
1314
gem 'rack-timeout'
1415
gem 'tilt'
1516
gem 'tire'
16-
gem 'unicorn'
1717
gem 'iso8601'
1818

1919
gem 'json'

Gemfile.lock

+2-6
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ GEM
106106
railties (>= 4.2.0)
107107
thor (>= 0.14, < 2.0)
108108
json (2.1.0)
109-
kgio (2.11.2)
110109
launchy (2.4.3)
111110
addressable (~> 2.3)
112111
loofah (2.2.0)
@@ -134,6 +133,7 @@ GEM
134133
byebug (~> 10.0)
135134
pry (~> 0.10)
136135
public_suffix (3.0.2)
136+
puma (3.11.3)
137137
rack (1.6.9)
138138
rack-test (0.6.3)
139139
rack (>= 1.0)
@@ -168,7 +168,6 @@ GEM
168168
activesupport (= 4.2.10)
169169
rake (>= 0.8.7)
170170
thor (>= 0.18.1, < 2.0)
171-
raindrops (0.19.0)
172171
rake (12.3.0)
173172
redcarpet (3.4.0)
174173
redis (4.0.1)
@@ -251,9 +250,6 @@ GEM
251250
unf (0.1.4)
252251
unf_ext
253252
unf_ext (0.0.7.5)
254-
unicorn (5.4.0)
255-
kgio (~> 2.6)
256-
raindrops (~> 0.7)
257253
uniform_notifier (1.11.0)
258254
vcr (4.0.0)
259255
webmock (3.3.0)
@@ -289,6 +285,7 @@ DEPENDENCIES
289285
octokit
290286
pg (= 0.21.0)
291287
pry-byebug
288+
puma
292289
rack-timeout
293290
rails (= 4.2.10)
294291
rails-perftest
@@ -304,7 +301,6 @@ DEPENDENCIES
304301
tilt
305302
tire
306303
uglifier
307-
unicorn
308304
vcr
309305
webmock
310306
yajl-ruby

Procfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
1+
web: bundle exec puma -C config/puma.rb

config/puma.rb

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# frozen_string_literal: true
2+
3+
# Puma can serve each request in a thread from an internal thread pool.
4+
# The `threads` method setting takes two numbers: a minimum and maximum.
5+
# Any libraries that use thread pools should be configured to match
6+
# the maximum value specified for Puma. Default is set to 5 threads for minimum
7+
# and maximum; this matches the default thread size of Active Record.
8+
#
9+
threads_count = Integer(ENV.fetch('RAILS_MAX_THREADS') { 5 })
10+
threads threads_count, threads_count
11+
12+
# Specifies the `port` that Puma will listen on to receive requests; default is 5000.
13+
#
14+
port ENV.fetch('PORT') { 5000 }
15+
16+
# Specifies the `environment` that Puma will run in.
17+
#
18+
environment ENV.fetch('RAILS_ENV') { 'development' }
19+
20+
# Specifies the number of `workers` to boot in clustered mode.
21+
# Workers are forked webserver processes. If using threads and workers together
22+
# the concurrency of the application would be max `threads` * `workers`.
23+
# Workers do not work on JRuby or Windows (both of which do not support
24+
# processes).
25+
#
26+
workers Integer(ENV.fetch('WEB_CONCURRENCY') { 3 })
27+
28+
# Use the `preload_app!` method when specifying a `workers` number.
29+
# This directive tells Puma to first boot the application and load code
30+
# before forking the application. This takes advantage of Copy On Write
31+
# process behavior so workers use less memory. If you use this option
32+
# you need to make sure to reconnect any threads in the `on_worker_boot`
33+
# block.
34+
#
35+
preload_app!
36+
37+
# If you are preloading your application and using Active Record, it's
38+
# recommended that you close any connections to the database before workers
39+
# are forked to prevent connection leakage.
40+
#
41+
before_fork do
42+
ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
43+
end
44+
45+
# The code in the `on_worker_boot` will be called if you are using
46+
# clustered mode by specifying a number of `workers`. After each worker
47+
# process is booted, this block will be run. If you are using the `preload_app!`
48+
# option, you will want to use this block to reconnect to any threads
49+
# or connections that may have been created at application boot, as Ruby
50+
# cannot share connections between processes.
51+
#
52+
on_worker_boot do
53+
ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
54+
end
55+
56+
# Allow puma to be restarted by `rails restart` command.
57+
plugin :tmp_restart

config/unicorn.rb

-22
This file was deleted.

0 commit comments

Comments
 (0)