thin 1.3.1 → 1.4.0

data/lib/thin/server.rb

@@ -187,6 +187,12 @@ module Thin
       @backend.stop!
     end
     
+    def reopen_log
+      file = File.expand_path(log_file)
+      log ">> Reopening log file: #{file}"
+      Daemonize.redirect_io(file)
+    end
+    
     # == Configure the server
     # The process might need to have superuser privilege to configure
     # server with optimal options.
@@ -208,17 +214,24 @@ module Thin
       @backend.running?
     end
     
+    # deamonizing kills our HUP signal, so we set them again
+    def after_daemonize
+      setup_signals
+    end
+
     protected
       # Register signals:
       # * TERM & QUIT calls +stop+ to shutdown gracefully.
       # * INT calls <tt>stop!</tt> to force shutdown.
       # * HUP calls <tt>restart</tt> to ... surprise, restart!
+      # * USR1 reopen log files.
       def setup_signals
         trap('INT')  { stop! }
         trap('TERM') { stop }
         unless Thin.win?
           trap('QUIT') { stop }
           trap('HUP')  { restart }
+          trap('USR1') { reopen_log }
         end
       end
       

data/lib/thin/version.rb

@@ -5,12 +5,12 @@ module Thin
   
   module VERSION #:nodoc:
     MAJOR    = 1
-    MINOR    = 3
-    TINY     = 1
+    MINOR    = 4
+    TINY     = 0
     
     STRING   = [MAJOR, MINOR, TINY].join('.')
     
-    CODENAME = "Triple Espresso".freeze
+    CODENAME = "Chromeo".freeze
     
     RACK     = [1, 0].freeze # Rack protocol version
   end

metadata

@@ -2,7 +2,7 @@
 name: thin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors: 
 - Marc-Andre Cournoyer
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 -05:00
+date: 2012-07-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,11 +56,8 @@ extra_rdoc_files: []
 
 files: 
 - CHANGELOG
-- README
+- README.md
 - Rakefile
-- benchmark/abc
-- benchmark/benchmarker.rb
-- benchmark/runner
 - bin/thin
 - example/adapter.rb
 - example/async_app.ru
@@ -99,89 +96,6 @@ files:
 - lib/thin/statuses.rb
 - lib/thin/version.rb
 - lib/thin.rb
-- spec/backends/swiftiply_client_spec.rb
-- spec/backends/tcp_server_spec.rb
-- spec/backends/unix_server_spec.rb
-- spec/command_spec.rb
-- spec/configs/cluster.yml
-- spec/configs/single.yml
-- spec/connection_spec.rb
-- spec/controllers/cluster_spec.rb
-- spec/controllers/controller_spec.rb
-- spec/controllers/service_spec.rb
-- spec/daemonizing_spec.rb
-- spec/headers_spec.rb
-- spec/logging_spec.rb
-- spec/perf/request_perf_spec.rb
-- spec/perf/response_perf_spec.rb
-- spec/perf/server_perf_spec.rb
-- spec/rack/loader_spec.rb
-- spec/rack/rails_adapter_spec.rb
-- spec/rails_app/app/controllers/application.rb
-- spec/rails_app/app/controllers/simple_controller.rb
-- spec/rails_app/app/helpers/application_helper.rb
-- spec/rails_app/app/views/simple/index.html.erb
-- spec/rails_app/config/boot.rb
-- spec/rails_app/config/environment.rb
-- spec/rails_app/config/environments/development.rb
-- spec/rails_app/config/environments/production.rb
-- spec/rails_app/config/environments/test.rb
-- spec/rails_app/config/initializers/inflections.rb
-- spec/rails_app/config/initializers/mime_types.rb
-- spec/rails_app/config/routes.rb
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/dispatch.cgi
-- spec/rails_app/public/dispatch.fcgi
-- spec/rails_app/public/dispatch.rb
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/public/images/rails.png
-- spec/rails_app/public/index.html
-- spec/rails_app/public/javascripts/application.js
-- spec/rails_app/public/javascripts/controls.js
-- spec/rails_app/public/javascripts/dragdrop.js
-- spec/rails_app/public/javascripts/effects.js
-- spec/rails_app/public/javascripts/prototype.js
-- spec/rails_app/public/robots.txt
-- spec/rails_app/script/about
-- spec/rails_app/script/console
-- spec/rails_app/script/destroy
-- spec/rails_app/script/generate
-- spec/rails_app/script/performance/benchmarker
-- spec/rails_app/script/performance/profiler
-- spec/rails_app/script/performance/request
-- spec/rails_app/script/plugin
-- spec/rails_app/script/process/inspector
-- spec/rails_app/script/process/reaper
-- spec/rails_app/script/process/spawner
-- spec/rails_app/script/runner
-- spec/rails_app/script/server
-- spec/request/mongrel_spec.rb
-- spec/request/parser_spec.rb
-- spec/request/persistent_spec.rb
-- spec/request/processing_spec.rb
-- spec/response_spec.rb
-- spec/runner_spec.rb
-- spec/server/builder_spec.rb
-- spec/server/pipelining_spec.rb
-- spec/server/robustness_spec.rb
-- spec/server/stopping_spec.rb
-- spec/server/swiftiply.yml
-- spec/server/swiftiply_spec.rb
-- spec/server/tcp_spec.rb
-- spec/server/threaded_spec.rb
-- spec/server/unix_socket_spec.rb
-- spec/server_spec.rb
-- spec/spec_helper.rb
-- tasks/announce.rake
-- tasks/deploy.rake
-- tasks/email.erb
-- tasks/gem.rake
-- tasks/rdoc.rake
-- tasks/site.rake
-- tasks/spec.rake
-- tasks/stats.rake
 - ext/thin_parser/ext_help.h
 - ext/thin_parser/parser.h
 - ext/thin_parser/parser.c
@@ -191,8 +105,8 @@ files:
 - ext/thin_parser/parser.rl
 has_rdoc: true
 homepage: http://code.macournoyer.com/thin/
-licenses: []
-
+licenses: 
+- Ruby
 post_install_message: 
 rdoc_options: []
 

data/README

@@ -1,69 +0,0 @@
-== Thin
-Tiny, fast & funny HTTP server
-
-Thin is a Ruby web server that glues together 3 of the best Ruby libraries in web history:
-* the Mongrel parser: the root of Mongrel speed and security
-* Event Machine: a network I/O library with extremely high scalability, performance and stability
-* Rack: a minimal interface between webservers and Ruby frameworks
-
-Which makes it, with all humility, the most secure, stable, fast and extensible Ruby web server
-bundled in an easy to use gem for your own pleasure.
-
-Site:  http://code.macournoyer.com/thin/
-Group: http://groups.google.com/group/thin-ruby/topics
-Bugs:  http://thin.lighthouseapp.com/projects/7212-thin
-Code:  http://github.com/macournoyer/thin
-IRC:   #thin on freenode
-
-=== Installation
-For the latest stable version:
-
- sudo gem install thin
-
-Or from source:
-
- git clone git://github.com/macournoyer/thin.git
- cd thin
- rake install
-
-=== Usage
-A +thin+ script offers an easy way to start your Rails application:
-
- cd to/your/rails/app
- thin start
-
-But Thin is also usable with a Rack config file.
-You need to setup a config.ru file and pass it to the thin script:
-  
- cat config.ru
- app = proc do |env|
-  [
-    200,
-    {
-      'Content-Type' => 'text/html',
-      'Content-Length' => '2'
-    },
-    ['hi']
-  ]
- end
- 
- run app
-
- thin start -R config.ru
- 
-See example directory for more samples and run 'thin -h' for usage.
-
-=== License
-Ruby License, http://www.ruby-lang.org/en/LICENSE.txt.
-
-=== Credits
-The parser was stolen from Mongrel http://mongrel.rubyforge.org by Zed Shaw.
-Mongrel Web Server (Mongrel) is copyrighted free software by Zed A. Shaw
-<zedshaw at zedshaw dot com> You can redistribute it and/or modify it under
-either the terms of the GPL.
-
-Thin is copyright Marc-Andre Cournoyer <macournoyer@gmail.com>
-
-Get help at http://groups.google.com/group/thin-ruby/
-Report bugs at http://thin.lighthouseapp.com/projects/7212-thin
-and major security issues directly to a team member (see COMMITTERS)

data/benchmark/abc

@@ -1,51 +0,0 @@
-#!/usr/bin/env ruby
-# Automate benchmarking with ab with various concurrency levels.
-require 'optparse'
-
-options = {
-  :address  => '0.0.0.0',
-  :port     => 3000,
-  :requests => 1000,
-  :start    => 1,
-  :end      => 100,
-  :step     => 10
-}
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
-
-  opts.on("-n", "--requests NUM", "Number of requests")         { |num| options[:requests] = num }
-  opts.on("-a", "--address HOST", "Address (default: 0.0.0.0)") { |host| options[:address] = host }
-  opts.on("-p", "--port PORT", "use PORT (default: 3000)")      { |port| options[:port] = port.to_i }
-  opts.on("-s", "--start N", "First concurrency level")         { |n| options[:start] = n.to_i }
-  opts.on("-e", "--end N", "Last concurrency level")            { |n| options[:end] = n.to_i }
-  opts.on("-S", "--step N", "Concurrency level step")           { |n| options[:step] = n.to_i }
-  opts.on("-u", "--uri PATH", "Path to send to")                { |u| options[:uri] = u }
-  opts.on("-k", "--keep-alive", "Use Keep-Alive")               { options[:keep_alive] = true }
-  
-  opts.on_tail("-h", "--help", "Show this message")     { puts opts; exit }
-end.parse!(ARGV)
-
-puts 'request   concurrency   req/s    failures'
-puts '=' * 42
-
-c = options[:start]
-until c >= options[:end]
-  sleep 0.5
-  out = `nice -n20 ab #{'-k' if options[:keep_alive]} -c #{c} -n #{options[:requests]} #{options[:address]}:#{options[:port]}/#{options[:uri]} 2> /dev/null`
-
-  r = if requests = out.match(/^Requests.+?(\d+\.\d+)/)
-    requests[1].to_i
-  else
-    0
-  end
-  f = if requests = out.match(/^Failed requests.+?(\d+)/)
-    requests[1].to_i
-  else
-    0
-  end
-  
-  puts "#{options[:requests].to_s.ljust(9)} #{c.to_s.ljust(13)} #{r.to_s.ljust(8)} #{f}"
-  
-  c += options[:step]
-end

data/benchmark/benchmarker.rb

@@ -1,80 +0,0 @@
-require 'rack/lobster'
-
-class Benchmarker
-  PORT    = 7000
-  ADDRESS = '0.0.0.0'
-  
-  attr_accessor :requests, :concurrencies, :servers, :keep_alive
-  
-  def initialize
-    @servers = %w(Mongrel EMongrel Thin)
-    @requests = 1000
-    @concurrencies = [1, 10, 100]
-  end
-  
-  def writer(&block)
-    @writer = block
-  end
-  
-  def run!
-    @concurrencies.each do |concurrency|
-      @servers.each do |server|
-        req_sec, failed = run_one(server, concurrency)
-        @writer.call(server, @requests, concurrency, req_sec, failed)
-      end
-    end
-  end
-  
-  private
-    def start_server(handler_name)
-      @server = fork do
-        [STDOUT, STDERR].each { |o| o.reopen "/dev/null" }
-
-        case handler_name
-        when 'EMongrel'
-          require 'swiftcore/evented_mongrel'
-          handler_name = 'Mongrel'
-        end
-
-        app = proc do |env|
-          [200, {'Content-Type' => 'text/html', 'Content-Length' => '11'}, ['hello world']]
-        end
-
-        handler = Rack::Handler.const_get(handler_name)
-        handler.run app, :Host => ADDRESS, :Port => PORT
-      end
-    
-      sleep 2
-    end
-  
-    def stop_server
-      Process.kill('SIGKILL', @server)
-      Process.wait
-    end
-  
-    def run_ab(concurrency)
-      `nice -n20 ab -c #{concurrency} -n #{@requests} #{@keep_alive ? '-k' : ''} #{ADDRESS}:#{PORT}/ 2> /dev/null`
-    end
-  
-    def run_one(handler_name, concurrency)
-      start_server(handler_name)
-
-      out = run_ab(concurrency)
-
-      stop_server
-
-      req_sec = if matches = out.match(/^Requests.+?(\d+\.\d+)/)
-        matches[1].to_i
-      else
-        0
-      end
-    
-      failed = if matches = out.match(/^Failed requests.+?(\d+)/)
-        matches[1].to_i
-      else
-        0
-      end
-    
-      [req_sec, failed]
-    end
-end

data/benchmark/runner

@@ -1,82 +0,0 @@
-#!/usr/bin/env ruby
-# Simple benchmark to compare Thin performance against
-# other webservers supported by Rack.
-#
-# Run with:
-#
-#  ruby simple.rb [num of request] [print|graph] [concurrency levels]
-#
-
-$: << File.join(File.dirname(__FILE__), '..', 'lib')
-require 'thin'
-
-require File.dirname(__FILE__) + '/benchmarker'
-require 'optparse'
-
-options = {
-  :requests      => 1000,
-  :concurrencies => [1, 10, 100],
-  :keep_alive    => false,
-  :output        => :table
-}
-
-OptionParser.new do |opts|
-  opts.banner = "Usage: #{$PROGRAM_NAME} [options]"
-
-  opts.on("-n", "--requests NUM", "Number of requests")         { |num| options[:requests] = num.to_i }
-  opts.on("-c", "--concurrencies EXP", "Concurrency levels")    { |exp| options[:concurrencies] = eval(exp).to_a }
-  opts.on("-k", "--keep-alive", "Use persistent connections")   { options[:keep_alive] = true }
-  opts.on("-t", "--table", "Output as text table")              { options[:output] = :table }
-  opts.on("-g", "--graph", "Output as graph")                   { options[:output] = :graph }
-  
-  opts.on_tail("-h", "--help", "Show this message")     { puts opts; exit }
-end.parse!(ARGV)
-
-# benchmark output_type, %w(WEBrick Mongrel EMongrel Thin), request, levels
-b = Benchmarker.new
-b.requests = options[:requests]
-b.concurrencies = options[:concurrencies]
-b.keep_alive = options[:keep_alive]
-
-case options[:output]
-when :table
-  puts 'server     request   concurrency   req/s    failures'
-  puts '=' * 52
-  
-  b.writer do |server, requests, concurrency, req_sec, failed|
-    puts "#{server.ljust(8)}   #{requests}      #{concurrency.to_s.ljust(4)}          #{req_sec.to_s.ljust(8)} #{failed}"
-  end
-  
-  b.run!
-
-when :graph
-  require '/usr/local/lib/ruby/gems/1.8/gems/gruff-0.2.9/lib/gruff'
-  g = Gruff::Area.new
-  g.title = "#{options[:requests]} requests"
-  g.title << ' w/ Keep-Alive' if options[:keep_alive]
-  
-  g.x_axis_label  = 'Concurrency'
-  g.y_axis_label  = 'Requests / sec'
-  g.maximum_value = 0
-  g.minimum_value = 0
-  g.labels        = {}
-  b.concurrencies.each_with_index { |c, i| g.labels[i] = c.to_s }
-  
-  results = {}
-  
-  b.writer do |server, requests, concurrency, req_sec, failed|
-    print '.'
-    results[server] ||= []
-    results[server] << req_sec
-  end
-  
-  b.run!
-  puts
-  
-  results.each do |server, concurrencies|
-    g.data(server, concurrencies)    
-  end
-  
-  g.write('bench.png')
-  `open bench.png`
-end