From 6942184263e757de90bcb6d12c024b8c16664f96 Mon Sep 17 00:00:00 2001
From: Yohei Yasukawa <yasulab@gmail.com>
Date: Sun, 1 Jan 2017 23:34:42 +0900
Subject: [PATCH] Replace unicorn with puma

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++------
 Procfile     | 2 +-
 config.ru    | 1 -
 unicorn.rb   | 3 ---
 5 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 unicorn.rb

diff --git a/Gemfile b/Gemfile
index 43f8b339053..95ee5944bdb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gem 'bundler'
 gem 'jekyll'
 gem 'rack-jekyll'
 gem 'kramdown'
-gem 'unicorn'
+gem 'puma'
 
 # Gems to generate RailsGuides HTML from MD
 gem 'rake'
diff --git a/Gemfile.lock b/Gemfile.lock
index 346dc2b30d7..6912874b70a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,7 +71,6 @@ GEM
       sass (~> 3.4)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
-    kgio (2.11.0)
     kindlerb (0.1.1)
       mustache
       nokogiri
@@ -106,6 +105,7 @@ GEM
       byebug (~> 9.0)
       pry (~> 0.10)
     public_suffix (2.0.4)
+    puma (3.6.2)
     rack (2.0.1)
     rack-jekyll (0.3.5)
       jekyll
@@ -117,7 +117,6 @@ GEM
       nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    raindrops (0.17.0)
     rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
@@ -153,9 +152,6 @@ GEM
       rspec (>= 3.0, < 4.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicorn (5.2.0)
-      kgio (~> 2.6)
-      raindrops (~> 0.7)
     websocket (1.2.3)
     wraith (4.0.0)
       anemone
@@ -183,12 +179,12 @@ DEPENDENCIES
   newrelic_rpm
   nokogiri
   pry-byebug
+  puma
   rack-jekyll
   rake
   rb-readline
   rspec
   turnip
-  unicorn
   wraith
 
 RUBY VERSION
diff --git a/Procfile b/Procfile
index d34e30ba056..0d558b470af 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c ./unicorn.rb
+web: bundle exec puma -t 8:32 -w 3 -p $PORT
diff --git a/config.ru b/config.ru
index 2205dbae60b..dafa2284552 100644
--- a/config.ru
+++ b/config.ru
@@ -1,3 +1,2 @@
 require 'rack/jekyll'
-require 'yaml'
 run Rack::Jekyll.new
diff --git a/unicorn.rb b/unicorn.rb
deleted file mode 100644
index fac8c222974..00000000000
--- a/unicorn.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-worker_processes 6 # amount of unicorn workers to spin up
-timeout 30         # restarts workers that hang for 30 seconds
-preload_app true   # avoid regeneration of jekyll site for each fork