Unicorn replaced with puma

unicorn gem and configs have been replaced with puma configs found on https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server

Unicorn replaced with puma
unicorn gem and configs have been replaced with puma configs found on https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server
Andrei Gliga
1 parent 8c105794
Showing 6 changed files with 23 additions and 56 deletions Show diff stats
Gemfile
Gemfile.lock
Procfile
config.ru
config/puma.default.rb
config/unicorn.default.rb
@@ -100,8 +100,7 @@ end
  
 group :heroku, :production do
   gem 'rails_12factor', require: ENV.key?("HEROKU")
-  gem 'unicorn', require: false, platform: 'ruby'
-  gem 'unicorn-worker-killer'
+  gem 'puma'
 end
  
 gem 'therubyracer', platform: :ruby # C Ruby (MRI) or Rubinius, but NOT Windows
@@ -134,7 +134,6 @@ GEM
       multi_json
     font-awesome-rails (4.2.0.0)
       railties (>= 3.2, < 5.0)
-    get_process_mem (0.2.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     haml (4.0.6)
@@ -165,7 +164,6 @@ GEM
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.9.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     launchy (2.4.3-java)
@@ -258,6 +256,7 @@ GEM
       pry (~> 0.10)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
+    puma (2.15.3)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
     rack (1.6.4)
@@ -300,7 +299,6 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
-    raindrops (0.13.0)
     rake (10.4.2)
     ref (1.0.5)
     request_store (1.1.0)
@@ -398,13 +396,6 @@ GEM
       unf_ext
     unf (0.1.4-java)
     unf_ext (0.0.7.1)
-    unicorn (4.9.0)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.3)
-      get_process_mem (~> 0)
-      unicorn (~> 4)
     useragent (0.14.0)
     warden (1.2.3)
       rack (>= 1.0)
@@ -465,6 +456,7 @@ DEPENDENCIES
   poltergeist
   pry-byebug
   pry-rails
+  puma
   quiet_assets
   rack-ssl
   rack-ssl-enforcer
@@ -483,8 +475,6 @@ DEPENDENCIES
   timecop
   uglifier
   underscore-rails
-  unicorn
-  unicorn-worker-killer
   useragent
   xmpp4r
   yajl-ruby
-web: bundle exec unicorn -c ./config/unicorn.default.rb
+web: bundle exec puma -C config/puma.default.rb
-if ENV['USE_UNICORN_WORKER_KILLER']
-  require 'unicorn/worker_killer'
-  max_request_min =  ENV['KILL_ON_REQUEST_COUNT_MIN'].to_i || 3072
-  max_request_max =  ENV['KILL_ON_REQUEST_COUNT_MAX'].to_i || 4096
-  use Unicorn::WorkerKiller::MaxRequests, max_request_min, max_request_max
-  oom_min = ((ENV['KILL_ON_RSS_MIN'].to_i || 250) * (1024**2))
-  oom_max = ((ENV['KILL_ON_RSS_MAX'].to_i || 300) * (1024**2))
-  use Unicorn::WorkerKiller::Oom, oom_min, oom_max
-end
-
 # This file is used by Rack-based servers to start the application.
  
 require ::File.expand_path('../config/environment', __FILE__)
@@ -0,0 +1,19 @@
+# https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server
+
+workers Integer(ENV['WEB_CONCURRENCY'] || 2)
+threads_count = Integer(ENV['MAX_THREADS'] || 5)
+threads threads_count, threads_count
+
+preload_app!
+
+rackup      DefaultRackup
+port        ENV['PORT']     || 3000
+environment ENV['RACK_ENV'] || 'development'
+
+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
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.establish_connection
+  end
+end
@@ -1,31 +0,0 @@
-# http://michaelvanrooijen.com/articles/2011/06/01-more-concurrency-on-a-single-heroku-dyno-with-the-new-celadon-cedar-stack/
-
-worker_processes 3 # amount of unicorn workers to spin up
-timeout 30         # restarts workers that hang for 30 seconds
-preload_app true
-listen ENV['PORT'] || 8080
-pid ENV['UNICORN_PID'] if ENV['UNICORN_PID']
-
-# Taken from github: https://github.com/blog/517-unicorn
-# Though everyone uses pretty miuch the same code
-before_fork do |server, _worker|
-  ##
-  # When sent a USR2, Unicorn will suffix its pidfile with .oldbin and
-  # immediately start loading up a new version of itself (loaded with a new
-  # version of our app). When this new Unicorn is completely loaded
-  # it will begin spawning workers. The first worker spawned will check to
-  # see if an .oldbin pidfile exists. If so, this means we've just booted up
-  # a new Unicorn and need to tell the old one that it can now die. To do so
-  # we send it a QUIT.
-  #
-  # Using this method we get 0 downtime deploys.
-
-  old_pid = "#{server.config[:pid]}.oldbin"
-  if File.exist?(old_pid) && server.pid != old_pid
-    begin
-      Process.kill("QUIT", File.read(old_pid).to_i)
-    rescue Errno::ENOENT, Errno::ESRCH
-      warn "Unicorn: master process already killed, no problem"
-    end
-  end
-end
...	...	@@ -100,8 +100,7 @@ end
100	100
101	101	group :heroku, :production do
102	102	gem 'rails_12factor', require: ENV.key?("HEROKU")
103		- gem 'unicorn', require: false, platform: 'ruby'
104		- gem 'unicorn-worker-killer'
	103	+ gem 'puma'
105	104	end
106	105
107	106	gem 'therubyracer', platform: :ruby # C Ruby (MRI) or Rubinius, but NOT Windows
...	...
...	...	@@ -134,7 +134,6 @@ GEM
134	134	multi_json
135	135	font-awesome-rails (4.2.0.0)
136	136	railties (>= 3.2, < 5.0)
137		- get_process_mem (0.2.0)
138	137	globalid (0.3.6)
139	138	activesupport (>= 4.1.0)
140	139	haml (4.0.6)
...	...	@@ -165,7 +164,6 @@ GEM
165	164	kaminari (0.16.3)
166	165	actionpack (>= 3.0.0)
167	166	activesupport (>= 3.0.0)
168		- kgio (2.9.3)
169	167	launchy (2.4.3)
170	168	addressable (~> 2.3)
171	169	launchy (2.4.3-java)
...	...	@@ -258,6 +256,7 @@ GEM
258	256	pry (~> 0.10)
259	257	pry-rails (0.3.4)
260	258	pry (>= 0.9.10)
	259	+ puma (2.15.3)
261	260	quiet_assets (1.1.0)
262	261	railties (>= 3.1, < 5.0)
263	262	rack (1.6.4)
...	...	@@ -300,7 +299,6 @@ GEM
300	299	rake (>= 0.8.7)
301	300	thor (>= 0.18.1, < 2.0)
302	301	rainbow (2.0.0)
303		- raindrops (0.13.0)
304	302	rake (10.4.2)
305	303	ref (1.0.5)
306	304	request_store (1.1.0)
...	...	@@ -398,13 +396,6 @@ GEM
398	396	unf_ext
399	397	unf (0.1.4-java)
400	398	unf_ext (0.0.7.1)
401		- unicorn (4.9.0)
402		- kgio (~> 2.6)
403		- rack
404		- raindrops (~> 0.7)
405		- unicorn-worker-killer (0.4.3)
406		- get_process_mem (~> 0)
407		- unicorn (~> 4)
408	399	useragent (0.14.0)
409	400	warden (1.2.3)
410	401	rack (>= 1.0)
...	...	@@ -465,6 +456,7 @@ DEPENDENCIES
465	456	poltergeist
466	457	pry-byebug
467	458	pry-rails
	459	+ puma
468	460	quiet_assets
469	461	rack-ssl
470	462	rack-ssl-enforcer
...	...	@@ -483,8 +475,6 @@ DEPENDENCIES
483	475	timecop
484	476	uglifier
485	477	underscore-rails
486		- unicorn
487		- unicorn-worker-killer
488	478	useragent
489	479	xmpp4r
490	480	yajl-ruby
...	...
1		-web: bundle exec unicorn -c ./config/unicorn.default.rb
	1	+web: bundle exec puma -C config/puma.default.rb
...	...
1		-if ENV['USE_UNICORN_WORKER_KILLER']
2		- require 'unicorn/worker_killer'
3		- max_request_min = ENV['KILL_ON_REQUEST_COUNT_MIN'].to_i \|\| 3072
4		- max_request_max = ENV['KILL_ON_REQUEST_COUNT_MAX'].to_i \|\| 4096
5		- use Unicorn::WorkerKiller::MaxRequests, max_request_min, max_request_max
6		- oom_min = ((ENV['KILL_ON_RSS_MIN'].to_i \|\| 250) * (1024**2))
7		- oom_max = ((ENV['KILL_ON_RSS_MAX'].to_i \|\| 300) * (1024**2))
8		- use Unicorn::WorkerKiller::Oom, oom_min, oom_max
9		-end
10		-
11	1	# This file is used by Rack-based servers to start the application.
12	2
13	3	require ::File.expand_path('../config/environment', __FILE__)
...	...
...	...	@@ -0,0 +1,19 @@
	1	+# https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server
	2	+
	3	+workers Integer(ENV['WEB_CONCURRENCY'] \|\| 2)
	4	+threads_count = Integer(ENV['MAX_THREADS'] \|\| 5)
	5	+threads threads_count, threads_count
	6	+
	7	+preload_app!
	8	+
	9	+rackup DefaultRackup
	10	+port ENV['PORT'] \|\| 3000
	11	+environment ENV['RACK_ENV'] \|\| 'development'
	12	+
	13	+on_worker_boot do
	14	+ # Worker specific setup for Rails 4.1+
	15	+ # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
	16	+ ActiveSupport.on_load(:active_record) do
	17	+ ActiveRecord::Base.establish_connection
	18	+ end
	19	+end
...	...
...	...	@@ -1,31 +0,0 @@
1		-# http://michaelvanrooijen.com/articles/2011/06/01-more-concurrency-on-a-single-heroku-dyno-with-the-new-celadon-cedar-stack/
2		-
3		-worker_processes 3 # amount of unicorn workers to spin up
4		-timeout 30 # restarts workers that hang for 30 seconds
5		-preload_app true
6		-listen ENV['PORT'] \|\| 8080
7		-pid ENV['UNICORN_PID'] if ENV['UNICORN_PID']
8		-
9		-# Taken from github: https://github.com/blog/517-unicorn
10		-# Though everyone uses pretty miuch the same code
11		-before_fork do \|server, _worker\|
12		- ##
13		- # When sent a USR2, Unicorn will suffix its pidfile with .oldbin and
14		- # immediately start loading up a new version of itself (loaded with a new
15		- # version of our app). When this new Unicorn is completely loaded
16		- # it will begin spawning workers. The first worker spawned will check to
17		- # see if an .oldbin pidfile exists. If so, this means we've just booted up
18		- # a new Unicorn and need to tell the old one that it can now die. To do so
19		- # we send it a QUIT.
20		- #
21		- # Using this method we get 0 downtime deploys.
22		-
23		- old_pid = "#{server.config[:pid]}.oldbin"
24		- if File.exist?(old_pid) && server.pid != old_pid
25		- begin
26		- Process.kill("QUIT", File.read(old_pid).to_i)
27		- rescue Errno::ENOENT, Errno::ESRCH
28		- warn "Unicorn: master process already killed, no problem"
29		- end
30		- end
31		-end