From 2462b3bb67b745f84ffb4f4e6ce70290242b5f57 Mon Sep 17 00:00:00 2001 From: Florian Hanke Date: Wed, 15 Jun 2011 15:10:35 +1000 Subject: [PATCH] + server uses thin --- Procfile | 4 ++-- server/Gemfile | 2 +- server/Gemfile.lock | 12 +++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Procfile b/Procfile index cbf474e..864f62a 100755 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -server: cd server && bundle exec rake start -web: cd client && bundle exec ruby app.rb -p $PORT \ No newline at end of file +server: cd server; bundle exec thin -R config.ru -p 8080 start +web: cd client; bundle exec ruby app.rb -p $PORT \ No newline at end of file diff --git a/server/Gemfile b/server/Gemfile index 7bd4834..f97e314 100644 --- a/server/Gemfile +++ b/server/Gemfile @@ -21,7 +21,7 @@ gem 'rack_fast_escape', '2009.06.24' # Optional. Use your preferred web server. # -gem 'unicorn' +gem 'thin' # Optional. Use your preferred database adapter. # diff --git a/server/Gemfile.lock b/server/Gemfile.lock index 1b24d3a..12b767c 100644 --- a/server/Gemfile.lock +++ b/server/Gemfile.lock @@ -13,9 +13,10 @@ GEM activesupport (3.0.7) arel (2.0.10) builder (2.1.2) + daemons (1.0.10) diff-lcs (1.1.2) + eventmachine (0.12.10) i18n (0.5.0) - kgio (2.4.1) picky (2.4.2) picky-client (2.4.2) activesupport (>= 3.0.0) @@ -35,10 +36,11 @@ GEM diff-lcs (~> 1.1.2) rspec-mocks (2.6.0) text (0.2.0) + thin (1.2.11) + daemons (>= 1.0.9) + eventmachine (>= 0.12.6) + rack (>= 1.0.0) tzinfo (0.3.27) - unicorn (3.6.2) - kgio (~> 2.3) - rack url_escape (2009.06.24) yajl-ruby (0.8.2) @@ -57,5 +59,5 @@ DEPENDENCIES rake rspec text (~> 0.2.0) - unicorn + thin yajl-ruby (~> 0.8.1)