unicorn 0.99.0 → 0.990.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. data/.document +1 -0
  2. data/.gitignore +3 -1
  3. data/Documentation/unicorn.1.txt +1 -1
  4. data/FAQ +3 -2
  5. data/GIT-VERSION-GEN +1 -1
  6. data/GNUmakefile +43 -8
  7. data/KNOWN_ISSUES +3 -24
  8. data/PHILOSOPHY +3 -2
  9. data/Rakefile +23 -2
  10. data/Sandbox +78 -0
  11. data/bin/unicorn_rails +14 -36
  12. data/examples/big_app_gc.rb +33 -0
  13. data/examples/unicorn.conf.minimal.rb +13 -0
  14. data/examples/unicorn.conf.rb +9 -3
  15. data/ext/unicorn_http/unicorn_http.rl +14 -2
  16. data/ext/unicorn_http/unicorn_http_common.rl +1 -1
  17. data/lib/unicorn.rb +5 -11
  18. data/lib/unicorn/configurator.rb +22 -8
  19. data/lib/unicorn/const.rb +3 -1
  20. data/lib/unicorn/oob_gc.rb +58 -0
  21. data/lib/unicorn/util.rb +7 -9
  22. data/local.mk.sample +32 -36
  23. data/t/GNUmakefile +7 -2
  24. data/t/rails3-app/.gitignore +4 -0
  25. data/t/rails3-app/Gemfile +26 -0
  26. data/t/rails3-app/Rakefile +10 -0
  27. data/t/rails3-app/app/controllers/application_controller.rb +4 -0
  28. data/t/rails3-app/app/helpers/application_helper.rb +2 -0
  29. data/t/rails3-app/app/views/layouts/application.html.erb +14 -0
  30. data/t/rails3-app/config.ru +4 -0
  31. data/t/rails3-app/config/application.rb +46 -0
  32. data/t/rails3-app/config/boot.rb +6 -0
  33. data/t/rails3-app/config/database.yml +22 -0
  34. data/t/rails3-app/config/environment.rb +5 -0
  35. data/t/rails3-app/config/environments/development.rb +19 -0
  36. data/t/rails3-app/config/environments/production.rb +42 -0
  37. data/t/rails3-app/config/environments/test.rb +32 -0
  38. data/t/rails3-app/config/initializers/backtrace_silencers.rb +7 -0
  39. data/t/rails3-app/config/initializers/inflections.rb +10 -0
  40. data/t/rails3-app/config/initializers/mime_types.rb +5 -0
  41. data/t/rails3-app/config/initializers/secret_token.rb +7 -0
  42. data/t/rails3-app/config/initializers/session_store.rb +8 -0
  43. data/t/rails3-app/config/locales/en.yml +5 -0
  44. data/t/rails3-app/config/routes.rb +58 -0
  45. data/t/rails3-app/db/seeds.rb +7 -0
  46. data/t/rails3-app/doc/README_FOR_APP +2 -0
  47. data/{test/rails/app-2.3.5/db/.gitignore → t/rails3-app/lib/tasks/.gitkeep} +0 -0
  48. data/{test/rails/app-2.3.5 → t/rails3-app}/public/404.html +0 -0
  49. data/{test/rails/app-2.3.5 → t/rails3-app}/public/500.html +0 -0
  50. data/{test/rails/app-2.3.5 → t/rails3-app}/public/x.txt +0 -0
  51. data/t/rails3-app/script/rails +9 -0
  52. data/t/rails3-app/test/performance/browsing_test.rb +9 -0
  53. data/t/rails3-app/test/test_helper.rb +13 -0
  54. data/t/rails3-app/vendor/plugins/.gitkeep +0 -0
  55. data/t/t0300-rails3-basic.sh +56 -0
  56. data/t/test-lib.sh +2 -1
  57. data/test/exec/test_exec.rb +20 -3
  58. data/test/rails/{app-2.3.5 → app-2.3.8}/.gitignore +0 -0
  59. data/test/rails/{app-2.3.5 → app-2.3.8}/Rakefile +0 -0
  60. data/test/rails/{app-2.3.5 → app-2.3.8}/app/controllers/application_controller.rb +0 -0
  61. data/test/rails/{app-2.3.5 → app-2.3.8}/app/controllers/foo_controller.rb +0 -0
  62. data/test/rails/{app-2.3.5 → app-2.3.8}/app/helpers/application_helper.rb +0 -0
  63. data/test/rails/{app-2.3.5 → app-2.3.8}/config/boot.rb +0 -0
  64. data/test/rails/{app-2.3.5 → app-2.3.8}/config/database.yml +0 -0
  65. data/test/rails/{app-2.3.5 → app-2.3.8}/config/environment.rb +0 -0
  66. data/test/rails/{app-2.3.5 → app-2.3.8}/config/environments/development.rb +0 -0
  67. data/test/rails/{app-2.3.5 → app-2.3.8}/config/environments/production.rb +0 -0
  68. data/test/rails/{app-2.3.5 → app-2.3.8}/config/routes.rb +0 -0
  69. data/test/rails/app-2.3.8/db/.gitignore +0 -0
  70. data/test/rails/app-2.3.8/public/404.html +1 -0
  71. data/test/rails/app-2.3.8/public/500.html +1 -0
  72. data/test/rails/app-2.3.8/public/x.txt +1 -0
  73. data/test/rails/test_rails.rb +4 -0
  74. data/test/unit/test_http_parser.rb +11 -1
  75. data/test/unit/test_http_parser_ng.rb +21 -1
  76. data/test/unit/test_signals.rb +2 -2
  77. data/test/unit/test_socket_helper.rb +5 -3
  78. data/test/unit/test_util.rb +22 -18
  79. data/unicorn.gemspec +2 -0
  80. metadata +66 -18
@@ -0,0 +1,10 @@
1
+ # Add your own tasks in files placed in lib/tasks ending in .rake,
2
+ # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
3
+
4
+ require File.expand_path('../config/application', __FILE__)
5
+
6
+ require 'rake'
7
+ require 'rake/testtask'
8
+ require 'rake/rdoctask'
9
+
10
+ Rails::Application.load_tasks
@@ -0,0 +1,4 @@
1
+ class ApplicationController < ActionController::Base
2
+ protect_from_forgery
3
+ layout 'application'
4
+ end
@@ -0,0 +1,2 @@
1
+ module ApplicationHelper
2
+ end
@@ -0,0 +1,14 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <title>App</title>
5
+ <%= stylesheet_link_tag :all %>
6
+ <%= javascript_include_tag :defaults %>
7
+ <%= csrf_meta_tag %>
8
+ </head>
9
+ <body>
10
+
11
+ <%= yield %>
12
+
13
+ </body>
14
+ </html>
@@ -0,0 +1,4 @@
1
+ # This file is used by Rack-based servers to start the application.
2
+
3
+ require ::File.expand_path('../config/environment', __FILE__)
4
+ run App::Application
@@ -0,0 +1,46 @@
1
+ require File.expand_path('../boot', __FILE__)
2
+
3
+ require 'rails/all'
4
+
5
+ # If you have a Gemfile, require the gems listed there, including any gems
6
+ # you've limited to :test, :development, or :production.
7
+ Bundler.require(:default, Rails.env) if defined?(Bundler)
8
+
9
+ module App
10
+ class Application < Rails::Application
11
+ # Settings in config/environments/* take precedence over those specified here.
12
+ # Application configuration should go into files in config/initializers
13
+ # -- all .rb files in that directory are automatically loaded.
14
+
15
+ # Add additional load paths for your own custom dirs
16
+ # config.load_paths += %W( #{config.root}/extras )
17
+
18
+ # Only load the plugins named here, in the order given (default is alphabetical).
19
+ # :all can be used as a placeholder for all plugins not explicitly named
20
+ # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
21
+
22
+ # Activate observers that should always be running
23
+ # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
24
+
25
+ # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
26
+ # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
27
+ # config.time_zone = 'Central Time (US & Canada)'
28
+
29
+ # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
30
+ # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
31
+ # config.i18n.default_locale = :de
32
+
33
+ # Configure generators values. Many other options are available, be sure to check the documentation.
34
+ # config.generators do |g|
35
+ # g.orm :active_record
36
+ # g.template_engine :erb
37
+ # g.test_framework :test_unit, :fixture => true
38
+ # end
39
+
40
+ # Configure the default encoding used in templates for Ruby 1.9.
41
+ config.encoding = "utf-8"
42
+
43
+ # Configure sensitive parameters which will be filtered from the log file.
44
+ config.filter_parameters += [:password]
45
+ end
46
+ end
@@ -0,0 +1,6 @@
1
+ require 'rubygems'
2
+ # Set up gems listed in the Gemfile.
3
+ if File.exist?(File.expand_path('../../Gemfile', __FILE__))
4
+ require 'bundler'
5
+ Bundler.setup
6
+ end
@@ -0,0 +1,22 @@
1
+ # SQLite version 3.x
2
+ # gem install sqlite3-ruby (not necessary on OS X Leopard)
3
+ development:
4
+ adapter: sqlite3
5
+ database: db/development.sqlite3
6
+ pool: 5
7
+ timeout: 5000
8
+
9
+ # Warning: The database defined as "test" will be erased and
10
+ # re-generated from your development database when you run "rake".
11
+ # Do not set this db to the same as development or production.
12
+ test:
13
+ adapter: sqlite3
14
+ database: db/test.sqlite3
15
+ pool: 5
16
+ timeout: 5000
17
+
18
+ production:
19
+ adapter: sqlite3
20
+ database: db/production.sqlite3
21
+ pool: 5
22
+ timeout: 5000
@@ -0,0 +1,5 @@
1
+ # Load the rails application
2
+ require File.expand_path('../application', __FILE__)
3
+
4
+ # Initialize the rails application
5
+ App::Application.initialize!
@@ -0,0 +1,19 @@
1
+ App::Application.configure do
2
+ # Settings specified here will take precedence over those in config/environment.rb
3
+
4
+ # In the development environment your application's code is reloaded on
5
+ # every request. This slows down response time but is perfect for development
6
+ # since you don't have to restart the webserver when you make code changes.
7
+ config.cache_classes = false
8
+
9
+ # Log error messages when you accidentally call methods on nil.
10
+ config.whiny_nils = true
11
+
12
+ # Show full error reports and disable caching
13
+ config.consider_all_requests_local = true
14
+ config.action_view.debug_rjs = true
15
+ config.action_controller.perform_caching = false
16
+
17
+ # Don't care if the mailer can't send
18
+ config.action_mailer.raise_delivery_errors = false
19
+ end
@@ -0,0 +1,42 @@
1
+ App::Application.configure do
2
+ # Settings specified here will take precedence over those in config/environment.rb
3
+
4
+ # The production environment is meant for finished, "live" apps.
5
+ # Code is not reloaded between requests
6
+ config.cache_classes = true
7
+
8
+ # Full error reports are disabled and caching is turned on
9
+ config.consider_all_requests_local = false
10
+ config.action_controller.perform_caching = true
11
+
12
+ # Specifies the header that your server uses for sending files
13
+ config.action_dispatch.x_sendfile_header = "X-Sendfile"
14
+
15
+ # For nginx:
16
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
17
+
18
+ # If you have no front-end server that supports something like X-Sendfile,
19
+ # just comment this out and Rails will serve the files
20
+
21
+ # See everything in the log (default is :info)
22
+ # config.log_level = :debug
23
+
24
+ # Use a different logger for distributed setups
25
+ # config.logger = SyslogLogger.new
26
+
27
+ # Use a different cache store in production
28
+ # config.cache_store = :mem_cache_store
29
+
30
+ # Disable Rails's static asset server
31
+ # In production, Apache or nginx will already do this
32
+ config.serve_static_assets = false
33
+
34
+ # Enable serving of images, stylesheets, and javascripts from an asset server
35
+ # config.action_controller.asset_host = "http://assets.example.com"
36
+
37
+ # Disable delivery errors, bad email addresses will be ignored
38
+ # config.action_mailer.raise_delivery_errors = false
39
+
40
+ # Enable threaded mode
41
+ # config.threadsafe!
42
+ end
@@ -0,0 +1,32 @@
1
+ App::Application.configure do
2
+ # Settings specified here will take precedence over those in config/environment.rb
3
+
4
+ # The test environment is used exclusively to run your application's
5
+ # test suite. You never need to work with it otherwise. Remember that
6
+ # your test database is "scratch space" for the test suite and is wiped
7
+ # and recreated between test runs. Don't rely on the data there!
8
+ config.cache_classes = true
9
+
10
+ # Log error messages when you accidentally call methods on nil.
11
+ config.whiny_nils = true
12
+
13
+ # Show full error reports and disable caching
14
+ config.consider_all_requests_local = true
15
+ config.action_controller.perform_caching = false
16
+
17
+ # Raise exceptions instead of rendering exception templates
18
+ config.action_dispatch.show_exceptions = false
19
+
20
+ # Disable request forgery protection in test environment
21
+ config.action_controller.allow_forgery_protection = false
22
+
23
+ # Tell Action Mailer not to deliver emails to the real world.
24
+ # The :test delivery method accumulates sent emails in the
25
+ # ActionMailer::Base.deliveries array.
26
+ config.action_mailer.delivery_method = :test
27
+
28
+ # Use SQL instead of Active Record's schema dumper when creating the test database.
29
+ # This is necessary if your schema can't be completely dumped by the schema dumper,
30
+ # like if you have constraints or database-specific column types
31
+ # config.active_record.schema_format = :sql
32
+ end
@@ -0,0 +1,7 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
4
+ # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
5
+
6
+ # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
7
+ # Rails.backtrace_cleaner.remove_silencers!
@@ -0,0 +1,10 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Add new inflection rules using the following format
4
+ # (all these examples are active by default):
5
+ # ActiveSupport::Inflector.inflections do |inflect|
6
+ # inflect.plural /^(ox)$/i, '\1en'
7
+ # inflect.singular /^(ox)en/i, '\1'
8
+ # inflect.irregular 'person', 'people'
9
+ # inflect.uncountable %w( fish sheep )
10
+ # end
@@ -0,0 +1,5 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Add new mime types for use in respond_to blocks:
4
+ # Mime::Type.register "text/richtext", :rtf
5
+ # Mime::Type.register_alias "text/html", :iphone
@@ -0,0 +1,7 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ # Your secret key for verifying the integrity of signed cookies.
4
+ # If you change this key, all old signed cookies will become invalid!
5
+ # Make sure the secret is at least 30 characters and all random,
6
+ # no regular words or you'll be exposed to dictionary attacks.
7
+ Rails.application.config.secret_token = '71ca844cc99ed2057a65cc6bd66b57fbbf69e8d4aef00072e41c3e896635e99ea485a6ed45f6e846d5547d614235df146a9756920b8b4a1726a53e75cda45bd1'
@@ -0,0 +1,8 @@
1
+ # Be sure to restart your server when you modify this file.
2
+
3
+ Rails.application.config.session_store :cookie_store, :key => '_app_session'
4
+
5
+ # Use the database for sessions instead of the cookie-based default,
6
+ # which shouldn't be used to store highly confidential information
7
+ # (create the session table with "rake db:sessions:create")
8
+ # Rails.application.config.session_store :active_record_store
@@ -0,0 +1,5 @@
1
+ # Sample localization file for English. Add more files in this directory for other locales.
2
+ # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
3
+
4
+ en:
5
+ hello: "Hello world"
@@ -0,0 +1,58 @@
1
+ App::Application.routes.draw do |map|
2
+ # The priority is based upon order of creation:
3
+ # first created -> highest priority.
4
+
5
+ # Sample of regular route:
6
+ # match 'products/:id' => 'catalog#view'
7
+ # Keep in mind you can assign values other than :controller and :action
8
+
9
+ # Sample of named route:
10
+ # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
11
+ # This route can be invoked with purchase_url(:id => product.id)
12
+
13
+ # Sample resource route (maps HTTP verbs to controller actions automatically):
14
+ # resources :products
15
+
16
+ # Sample resource route with options:
17
+ # resources :products do
18
+ # member do
19
+ # get :short
20
+ # post :toggle
21
+ # end
22
+ #
23
+ # collection do
24
+ # get :sold
25
+ # end
26
+ # end
27
+
28
+ # Sample resource route with sub-resources:
29
+ # resources :products do
30
+ # resources :comments, :sales
31
+ # resource :seller
32
+ # end
33
+
34
+ # Sample resource route with more complex sub-resources
35
+ # resources :products do
36
+ # resources :comments
37
+ # resources :sales do
38
+ # get :recent, :on => :collection
39
+ # end
40
+ # end
41
+
42
+ # Sample resource route within a namespace:
43
+ # namespace :admin do
44
+ # # Directs /admin/products/* to Admin::ProductsController
45
+ # # (app/controllers/admin/products_controller.rb)
46
+ # resources :products
47
+ # end
48
+
49
+ # You can have the root of your site routed with "root"
50
+ # just remember to delete public/index.html.
51
+ # root :to => "welcome#index"
52
+
53
+ # See how all your routes lay out with "rake routes"
54
+
55
+ # This is a legacy wild controller route that's not recommended for RESTful applications.
56
+ # Note: This route will make all actions in every controller accessible via GET requests.
57
+ # match ':controller(/:action(/:id(.:format)))'
58
+ end
@@ -0,0 +1,7 @@
1
+ # This file should contain all the record creation needed to seed the database with its default values.
2
+ # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
3
+ #
4
+ # Examples:
5
+ #
6
+ # cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
7
+ # Mayor.create(:name => 'Daley', :city => cities.first)
@@ -0,0 +1,2 @@
1
+ Use this README file to introduce your application and point to useful places in the API for learning more.
2
+ Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
File without changes
@@ -0,0 +1,9 @@
1
+ #!/usr/bin/env ruby
2
+ # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
3
+
4
+ ENV_PATH = File.expand_path('../../config/environment', __FILE__)
5
+ BOOT_PATH = File.expand_path('../../config/boot', __FILE__)
6
+ APP_PATH = File.expand_path('../../config/application', __FILE__)
7
+
8
+ require BOOT_PATH
9
+ require 'rails/commands'
@@ -0,0 +1,9 @@
1
+ require 'test_helper'
2
+ require 'rails/performance_test_help'
3
+
4
+ # Profiling results for each test method are written to tmp/performance.
5
+ class BrowsingTest < ActionDispatch::PerformanceTest
6
+ def test_homepage
7
+ get '/'
8
+ end
9
+ end
@@ -0,0 +1,13 @@
1
+ ENV["RAILS_ENV"] = "test"
2
+ require File.expand_path('../../config/environment', __FILE__)
3
+ require 'rails/test_help'
4
+
5
+ class ActiveSupport::TestCase
6
+ # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
7
+ #
8
+ # Note: You'll currently still have to declare fixtures explicitly in integration tests
9
+ # -- they do not yet inherit this setting
10
+ fixtures :all
11
+
12
+ # Add more helper methods to be used by all tests here...
13
+ end
File without changes
@@ -0,0 +1,56 @@
1
+ #!/bin/sh
2
+ RAILS_VERSION=${RAILS_VERSION-3.0.0.beta3}
3
+
4
+ . ./test-lib.sh
5
+
6
+ case $RUBY_VERSION in
7
+ 1.8.7|1.9.2) ;;
8
+ *)
9
+ t_info "RUBY_VERSION=$RUBY_VERSION unsupported for Rails 3"
10
+ exit 0
11
+ ;;
12
+ esac
13
+
14
+ arch_gems=../tmp/isolate/ruby-$RUBY_VERSION/gems
15
+ rails_gems=../tmp/isolate/rails-$RAILS_VERSION/gems
16
+ rails_bin="$rails_gems/rails-$RAILS_VERSION/bin/rails"
17
+ if ! test -d "$arch_gems" || ! test -d "$rails_gems" || ! test -x "$rails_bin"
18
+ then
19
+ ( cd ../ && $RAKE isolate )
20
+ fi
21
+
22
+ for i in $arch_gems/*-* $rails_gems/*-*
23
+ do
24
+ if test -d $i/lib
25
+ then
26
+ RUBYLIB=$(cd $i/lib && pwd):$RUBYLIB
27
+ fi
28
+ done
29
+
30
+ export RUBYLIB
31
+
32
+ t_plan 3 "Rails 3 (beta) tests"
33
+
34
+ t_begin "setup and start" && {
35
+ rails3_app=$(cd rails3-app && pwd)
36
+ rm -rf $t_pfx.app
37
+ mkdir $t_pfx.app
38
+ cd $t_pfx.app
39
+ ( cd $rails3_app && tar cf - . ) | tar xf -
40
+ $RAKE db:sessions:create
41
+ $RAKE db:migrate
42
+ unicorn_setup
43
+ unicorn -D -c $unicorn_config
44
+ unicorn_wait_start
45
+ }
46
+
47
+ # add more tests here
48
+ t_begin "hit with curl" && {
49
+ curl -v http://$listen/ || :
50
+ }
51
+
52
+ t_begin "killing succeeds" && {
53
+ kill $unicorn_pid
54
+ }
55
+
56
+ t_done