Merge remote branch 'martinciu/unicorn'

Conflicts: Gemfile.lock

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