From c1da6228a7df5f14f2a7b1bb2682052e7324263b Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Sat, 19 Jan 2013 19:41:23 +0100
Subject: [PATCH] Use thin as a webserver (hopefully it fixes new relic

---
 Gemfile       | 2 +-
 Gemfile.lock  | 8 +-------
 script/server | 4 ++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index c0555e45..6a67fe8d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'sinatra-contrib', github: 'sinatra/sinatra-contrib', require: nil
 # TODO need to release the gem as soon i'm certain this change makes sense
 gem 'simple_states',      github: 'svenfuchs/simple_states', branch: 'sf-set-state-early'
 
-gem 'unicorn'
+gem 'thin'
 gem "sentry-raven",    github: 'getsentry/raven-ruby'
 gem 'yard-sinatra',    github: 'rkh/yard-sinatra'
 gem 'rack-contrib',    github: 'rack/rack-contrib'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ed4fc34..3ba91172 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,7 +188,6 @@ GEM
     i18n (0.6.1)
     journey (1.0.4)
     json (1.7.6)
-    kgio (2.8.0)
     listen (0.7.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -240,7 +239,6 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    raindrops (0.10.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -283,10 +281,6 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
-    unicorn (4.5.0)
-      kgio (~> 2.6)
-      rack
-      raindrops (~> 0.7)
     uuidtools (2.1.3)
     yajl-ruby (1.1.0)
     yard (0.8.3)
@@ -314,9 +308,9 @@ DEPENDENCIES
   simple_states!
   sinatra!
   sinatra-contrib!
+  thin
   travis-api!
   travis-core!
   travis-sidekiqs!
   travis-support!
-  unicorn
   yard-sinatra!
diff --git a/script/server b/script/server
index cf218d5f..569491a1 100755
--- a/script/server
+++ b/script/server
@@ -3,6 +3,6 @@ cd "$(dirname "$0")/.."
 [ $PORT ]     || PORT=3000
 [ $RACK_ENV ] || RACK_ENV=development
 
-cmd="ruby -I lib -S bundle exec ruby -I lib -S unicorn config.ru -c config/unicorn.rb -p $PORT -E $RACK_ENV"
-[[ $RACK_ENV == "development" ]] && exec rerun "$cmd -l 127.0.0.1:$PORT"
+cmd="ruby -I lib -S bundle exec ruby -I lib -S thin start -p $PORT -e $RACK_ENV" #--threaded"
+[[ $RACK_ENV == "development" ]] && exec rerun "$cmd -a 127.0.0.1"
 exec $cmd