Download as
Browse Code »

Commit 7dd78504b4dcb3a727fe1bdb001a3524af6817ca

Authored by Nathan Broadbent
2 parents a0e05047 c97a9fd2
Exists in master and in 1 other branch production

Merge remote branch 'martinciu/unicorn' 

Conflicts:
	Gemfile.lock
Showing 4 changed files with 13 additions and 9 deletions   Show diff stats
@@ -47,6 +47,6 @@ group :test do @@ -47,6 +47,6 @@ group :test do
47 end 47 end
48 48
49 group :heroku do 49 group :heroku do
50 - gem 'thin' 50 + gem 'unicorn'
51 end 51 end
52 52
@@ -44,7 +44,6 @@ GEM @@ -44,7 +44,6 @@ GEM
44 crack (0.3.1) 44 crack (0.3.1)
45 css_parser (1.2.5) 45 css_parser (1.2.5)
46 addressable 46 addressable
47 - daemons (1.1.4)  
48 database_cleaner (0.6.7) 47 database_cleaner (0.6.7)
49 devise (1.4.7) 48 devise (1.4.7)
50 bcrypt-ruby (~> 3.0) 49 bcrypt-ruby (~> 3.0)
@@ -56,7 +55,6 @@ GEM @@ -56,7 +55,6 @@ GEM
56 rspec (~> 2.0) 55 rspec (~> 2.0)
57 erubis (2.6.6) 56 erubis (2.6.6)
58 abstract (>= 1.0.0) 57 abstract (>= 1.0.0)
59 - eventmachine (0.12.10)  
60 factory_girl (1.3.3) 58 factory_girl (1.3.3)
61 factory_girl_rails (1.0.1) 59 factory_girl_rails (1.0.1)
62 factory_girl (~> 1.3) 60 factory_girl (~> 1.3)
@@ -82,6 +80,7 @@ GEM @@ -82,6 +80,7 @@ GEM
82 responders (~> 0.6.0) 80 responders (~> 0.6.0)
83 kaminari (0.12.4) 81 kaminari (0.12.4)
84 rails (>= 3.0.0) 82 rails (>= 3.0.0)
  83 + kgio (2.6.0)
85 libxml-ruby (2.2.2) 84 libxml-ruby (2.2.2)
86 lighthouse-api (2.0) 85 lighthouse-api (2.0)
87 activeresource (>= 3.0.0) 86 activeresource (>= 3.0.0)
@@ -151,6 +150,7 @@ GEM @@ -151,6 +150,7 @@ GEM
151 rake (>= 0.8.7) 150 rake (>= 0.8.7)
152 rdoc (~> 3.4) 151 rdoc (~> 3.4)
153 thor (~> 0.14.4) 152 thor (~> 0.14.4)
  153 + raindrops (0.8.0)
154 rake (0.9.2) 154 rake (0.9.2)
155 rbx-require-relative (0.0.5) 155 rbx-require-relative (0.0.5)
156 rdoc (3.9.4) 156 rdoc (3.9.4)
@@ -189,10 +189,6 @@ GEM @@ -189,10 +189,6 @@ GEM
189 typhoeus 189 typhoeus
190 ruby_core_source (0.1.5) 190 ruby_core_source (0.1.5)
191 archive-tar-minitar (>= 0.5.2) 191 archive-tar-minitar (>= 0.5.2)
192 - thin (1.2.11)  
193 - daemons (>= 1.0.9)  
194 - eventmachine (>= 0.12.6)  
195 - rack (>= 1.0.0)  
196 thor (0.14.6) 192 thor (0.14.6)
197 treetop (1.4.10) 193 treetop (1.4.10)
198 polyglot 194 polyglot
@@ -201,6 +197,10 @@ GEM @@ -201,6 +197,10 @@ GEM
201 mime-types 197 mime-types
202 mime-types 198 mime-types
203 tzinfo (0.3.30) 199 tzinfo (0.3.30)
  200 + unicorn (4.1.1)
  201 + kgio (~> 2.4)
  202 + rack
  203 + raindrops (~> 0.6)
204 useragent (0.3.2) 204 useragent (0.3.2)
205 warden (1.0.5) 205 warden (1.0.5)
206 rack (>= 1.0) 206 rack (>= 1.0)
@@ -241,6 +241,6 @@ DEPENDENCIES @@ -241,6 +241,6 @@ DEPENDENCIES
241 ruby-debug 241 ruby-debug
242 ruby-debug19 242 ruby-debug19
243 ruby-fogbugz 243 ruby-fogbugz
244 - thin 244 + unicorn
245 useragent (~> 0.3.1) 245 useragent (~> 0.3.1)
246 webmock 246 webmock
1 -web: bundle exec rails server thin -p $PORT 1 +web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
config/unicorn.rb 0 → 100644
  Diff comments   View file @7dd7850
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +# http://michaelvanrooijen.com/articles/2011/06/01-more-concurrency-on-a-single-heroku-dyno-with-the-new-celadon-cedar-stack/
  2 +
  3 +worker_processes 3 # amount of unicorn workers to spin up
  4 +timeout 30 # restarts workers that hang for 30 seconds
0 \ No newline at end of file 5 \ No newline at end of file