Permalink
Browse files

switch to thin

  • Loading branch information...
1 parent 8ba374e commit f16c601b3aa45b4feafe369a3640f6c827fdc409 @rkh rkh committed Jan 19, 2012
Showing with 11 additions and 15 deletions.
  1. +1 −1 Gemfile
  2. +7 −7 Gemfile.lock
  3. +1 −1 Procfile
  4. +2 −0 config/application.rb
  5. +0 −6 config/unicorn.rb
View
@@ -20,7 +20,7 @@ gem 'rdiscount'
gem 'postmark-rails'
group :deployment do
- gem 'unicorn'
+ gem 'thin'
gem 'rack-ssl'
end
View
@@ -80,13 +80,15 @@ GEM
capybara (>= 1.1.2)
cucumber (>= 1.1.3)
nokogiri (>= 1.5.0)
+ daemons (1.1.5)
database_cleaner (0.7.0)
devise (1.5.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.1)
diff-lcs (1.1.3)
erubis (2.7.0)
+ eventmachine (0.12.10)
execjs (1.2.13)
multi_json (~> 1.0)
ffi (1.0.11)
@@ -104,7 +106,6 @@ GEM
railties (>= 3.2.0.beta, < 5.0)
thor (~> 0.14)
json (1.6.4)
- kgio (2.6.0)
launchy (2.0.5)
addressable (~> 2.2.6)
letter_opener (0.0.2)
@@ -141,7 +142,6 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- raindrops (0.8.0)
rake (0.9.2.2)
rdiscount (1.6.8)
rdoc (3.12)
@@ -190,6 +190,10 @@ GEM
stripe (1.5.25)
rest-client (~> 1.4)
term-ansicolor (1.0.7)
+ thin (1.3.1)
+ daemons (>= 1.0.9)
+ eventmachine (>= 0.12.6)
+ rack (>= 1.0.0)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
@@ -199,10 +203,6 @@ GEM
uglifier (1.2.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- unicorn (4.1.1)
- kgio (~> 2.4)
- rack
- raindrops (~> 0.6)
warden (1.1.0)
rack (>= 1.0)
xpath (0.1.4)
@@ -239,5 +239,5 @@ DEPENDENCIES
sass-rails (~> 3.2.0.rc2)
simple_form
stripe
+ thin
uglifier (>= 1.0.3)
- unicorn
View
@@ -1 +1 @@
-web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
+web: bundle exec rails server thin -p $PORT
View
@@ -49,5 +49,7 @@ class Application < Rails::Application
config.assets.initialize_on_precompile = false
config.action_mailer.default_url_options = { :host => 'support.travis-ci.org' }
+
+ config.threadsafe!
end
end
View
@@ -1,6 +0,0 @@
-worker_processes 4
-timeout 5
-
-preload_app true
-before_fork { |_,_| ActiveRecord::Base.connection.disconnect! }
-after_fork { |_,_| ActiveRecord::Base.establish_connection }

0 comments on commit f16c601

Please sign in to comment.