From 75c60689d60bc0799233c64251b38902c834bbe8 Mon Sep 17 00:00:00 2001
From: Dan Barber <dan@new-bamboo.co.uk>
Date: Mon, 10 Mar 2014 10:28:56 +0000
Subject: [PATCH] Change webserver to Puma.

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++-------
 Procfile     |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index cb26cd8..5e9b46e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,7 +60,7 @@ group :test do
 end
 
 group :production do
-  gem 'thin'
+  gem 'puma'
   gem 'rails_12factor'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4654c1b..ce10baa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,7 +75,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    daemons (1.1.9)
     database_cleaner (1.2.0)
     debug_inspector (0.0.2)
     devise (3.2.3)
@@ -92,7 +91,6 @@ GEM
       dragonfly (~> 1.0)
       fog
     erubis (2.7.0)
-    eventmachine (1.0.3)
     excon (0.31.0)
     execjs (2.0.2)
     factory_girl (4.4.0)
@@ -154,6 +152,8 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    puma (2.8.1)
+      rack (>= 1.1, < 2.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -220,10 +220,6 @@ GEM
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       polyamorous (~> 0.6.0)
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
     thor (0.18.1)
     thread_safe (0.2.0)
       atomic (>= 1.1.7, < 2)
@@ -272,6 +268,7 @@ DEPENDENCIES
   poltergeist
   powder
   pry
+  puma
   rails (~> 4.0.0)
   rails_12factor
   redcarpet
@@ -284,7 +281,6 @@ DEPENDENCIES
   sprockets_better_errors
   sqlite3
   squeel
-  thin
   uglifier
   unf
   will_paginate
diff --git a/Procfile b/Procfile
index df44560..35c48c6 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1 @@
-web: bundle exec thin start -p $PORT -e $RACK_ENV
+web: bundle exec puma -p $PORT -e $RACK_ENV -t 0:5