choteaumt
/
adopt-a-hydrant
mirror of https://github.com/choteaumt/adopt-a-hydrant.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add concurrecy with unicorn" 

This reverts commit 999306ca95.

Conflicts:

	Gemfile.lock
	config/unicorn.rb
This commit is contained in:
Erik Michaels-Ober 2011-06-23 20:36:37 -07:00
parent dc44fa17d9
commit 698e42c025
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -17,10 +17,6 @@ group :development, :production do
gem 'pg' gem 'pg'
end end
group :production do
gem 'unicorn'
end
group :test do group :test do
gem 'ZenTest' gem 'ZenTest'
gem 'simplecov' gem 'simplecov'

7
Gemfile.lock
View File

@ -57,7 +57,6 @@ GEM
i18n (0.6.0) i18n (0.6.0)
jruby-openssl (0.7.4) jruby-openssl (0.7.4)
bouncy-castle-java bouncy-castle-java
kgio (2.5.0)
libv8 (3.3.10.2) libv8 (3.3.10.2)
mail (2.3.0) mail (2.3.0)
i18n (>= 0.4.0) i18n (>= 0.4.0)
@ -98,7 +97,7 @@ GEM
simplecov-html (~> 0.4.4) simplecov-html (~> 0.4.4)
simplecov-html (0.4.5) simplecov-html (0.4.5)
sprockets (2.0.0.beta.10) sprockets (2.0.0.beta.10)
hike (~> 1.1) hike (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.3) sqlite3 (1.3.3)
@ -115,9 +114,6 @@ GEM
uglifier (1.0.0) uglifier (1.0.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (>= 1.0.2)
unicorn (3.7.0)
kgio (~> 2.3)
rack
warden (1.0.4) warden (1.0.4)
rack (>= 1.0) rack (>= 1.0)
webmock (1.6.4) webmock (1.6.4)
@ -143,5 +139,4 @@ DEPENDENCIES
therubyrhino therubyrhino
turn turn
uglifier uglifier
unicorn
webmock webmock

1
Procfile
View File

@ -1 +0,0 @@
web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb

2
config/unicorn.rb
View File

@ -1,2 +0,0 @@
worker_processes 2
timeout 60