Browse files

Unicorn and gem update

  • Loading branch information...
1 parent 8f36a9c commit fb1196e53dfe37cccb94d4cbfbabf0765d845b78 @matthewford matthewford committed Aug 2, 2012
Showing with 13 additions and 8 deletions.
  1. +1 −1 Gemfile
  2. +10 −6 Gemfile.lock
  3. +1 −0 config/unicorn.rb
  4. +1 −1 startup.sh
View
2 Gemfile
@@ -15,6 +15,7 @@ gem 'builder'
gem 'railties'
gem 'airbrake'
+gem 'unicorn', '~> 4.3.1'
group :assets do
gem 'therubyracer'
@@ -24,7 +25,6 @@ group :assets do
end
group :development do
- gem 'puma'
gem 'capistrano'
gem 'debugger'
gem 'pry-rails'
View
16 Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: git://github.com/bmabey/database_cleaner.git
- revision: 3c61caeecbba41822a235b46a36f66f4a26292d6
+ revision: 3ce1fc9f8da517fb4fd93795bd1820f360a6ad9e
specs:
database_cleaner (0.8.0)
@@ -79,6 +79,7 @@ GEM
thor (~> 0.14)
json (1.7.4)
json_expressions (0.7.2)
+ kgio (2.7.4)
libv8 (3.3.10.4)
mail (2.4.4)
i18n (>= 0.4.0)
@@ -87,7 +88,7 @@ GEM
metaclass (0.0.1)
method_source (0.8)
mime-types (1.19)
- mocha (0.12.1)
+ mocha (0.12.2)
metaclass (~> 0.0.1)
multi_json (1.3.6)
mysql2 (0.3.11)
@@ -107,8 +108,6 @@ GEM
slop (~> 3.3.1)
pry-rails (0.1.6)
pry
- puma (1.5.0)
- rack (~> 1.2)
rabl (0.7.0)
activesupport (>= 2.3.14)
multi_json (~> 1.0)
@@ -134,6 +133,7 @@ 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)
@@ -161,7 +161,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- sequel (3.37.0)
+ sequel (3.38.0)
shoulda-matchers (1.2.0)
activesupport (>= 3.0.0)
simplecov (0.6.4)
@@ -195,6 +195,10 @@ GEM
uglifier (1.2.6)
execjs (>= 0.3.0)
multi_json (~> 1.3)
+ unicorn (4.3.1)
+ kgio (~> 2.6)
+ rack
+ raindrops (~> 0.7)
PLATFORMS
ruby
@@ -216,7 +220,6 @@ DEPENDENCIES
mysql2
oj
pry-rails
- puma
rabl
rails (= 3.2.7)
railties
@@ -231,3 +234,4 @@ DEPENDENCIES
therubyracer
tire
uglifier
+ unicorn (~> 4.3.1)
View
1 config/unicorn.rb
@@ -0,0 +1 @@
+worker_processes 4
View
2 startup.sh
@@ -1,4 +1,4 @@
#!/bin/bash
bundle install
-bundle exec rails s puma -p 3018
+bundle exec unicorn -p 3018

0 comments on commit fb1196e

Please sign in to comment.