mongrel 0.3.13.4 → 1.0

data/README

@@ -9,27 +9,7 @@ What makes Mongrel so fast is the careful use of a C extension to provide fast
 HTTP 1.1 protocol parsing and fast URI lookup.  This combination makes the server
 scream without too many portability issues.
 
-== Status
-
-Mongrel 0.3.9 now supports a fancy RubyGems based plugin system called GemPlugin.
-It uses the basic machinery of RubyGems to implement dynamically loaded plugins
-based on dependencies.  Writing a plugin is pretty easy, but right now it's
-not as well documented as it should be.  There is a simple example plugin 
-for adding a status command to your mongrel.  Just do:
-
- > gem install mongrel_status
-
-And you'll then get a new status command.  Then just do:
-
- > cd myrailsapp
- > mongrel_rails start -d
- > mongrel_rails status
-
-And it'll print out the PID your Rails app is running under.
-
-The GemPlugin project is a sub-project of Mongrel, but it's licensed under
-the Ruby license and is usable outside Mongrel
-
+You can view http://mongrel.rubyforge.org for more information.
 
 == Quick Start
 
@@ -60,39 +40,6 @@ changing to a different directory, adding more MIME types, and setting processor
 threads and timeouts.
 
 
-=== Win32 Service Support
-
-Mongrel now has support for running as a Win32 service right out of the
-box.  The support is still rough but works well enough that we decided
-to release it.  You can thank Luis Lavena for working on this and making
-it so nice.
-
-After you do the gem install, find a Rails application you want to run
-and do:
-
- $ mongrel_rails_service install -n myapp \ 
-     -r c:\my\path\to\myapp -p 4000 -e production
- $ mongrel_rails_service start -n myapp
-
-Now hit the port and poof, works.  
-
-Stopping a service is simple:
-
- $ mongrel_rails_service stop -n myapp
-
-If you run into an app that's not running right, my suggestion is to run it with
-the regular mongrel_rails runner:
-
- $ cd c:\my\path\to\myapp
- $ mongrel_rails start -p 4500
-
-Since that will spit out error messages and stuff to the console.  *Use CTRL-Pause/Break to stop.*
-
-Best thing about the win32 support is that you can simply use the Windows Services
-in Control Panel->Admin Tools to work with it.  You can also install the same
-Rails app as different installs.  For example I've got myapp_dev, and myapp_prod and
-just start/stop which one I want to work with.
-
 == Install
 
 It doesn't explicitly require Camping, but if you want to run the examples/camping/
@@ -104,7 +51,6 @@ who can build it for you.
 
 Finally, the source includes a setup.rb for those who hate RubyGems.
 
-
 == Usage
 
 The examples/simpletest.rb file has the following code as the simplest
@@ -135,26 +81,6 @@ This also shows the DirHandler with directory listings.  This is still
 rough but it should work for basic hosting.  *File extension to mime
 type mapping is missing though.*
 
-
-== Speed
-
-Like previous releases 0.3.1 continues the trend of making things
-as fast as possible.  It currently might be a little slower than
-other releases but should hold up pretty good against at least 
-WEBrick (especially when running Rails).
-
-As before you can control the number of processor threads (and thus
-ActiveRecord database connections) with:
-
- h = Mongrel::HttpServer.new("0.0.0.0", "3000", 40)
-
-Which will make 40 thread processors.  Right now the optimal setting is up in
-the air, but 20 seemed to be about the sweet spot on my systems.  The 
-limited processors also means that you can use ActiveRecord as-is and it will
-create a matching database connection for each processor thread.  More on 
-this in future releases.
-
-
 == Contact
 
 E-mail zedshaw at zedshaw.com and I'll help.  Comments about the API are welcome.

data/Rakefile

@@ -33,15 +33,15 @@ task :ragel do
 end
 
 task :site_webgen do
-  sh %{pushd doc/site; webgen; scp -r output/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/; popd }
+  sh %{pushd doc/site; webgen; ruby atom.rb > output/feed.atom; rsync -azv output/* rubyforge.org:/var/www/gforge-projects/mongrel/; popd }
 end
 
 task :site_rdoc do
-  sh %{ scp -r doc/rdoc/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/rdoc/ }
+  sh %{ rsync -azv doc/rdoc/* rubyforge.org:/var/www/gforge-projects/mongrel/rdoc/ }
 end
 
 task :site_coverage => [:rcov] do
-  sh %{ scp -r test/coverage/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/coverage/ }
+  sh %{ rsync -azv test/coverage/* rubyforge.org:/var/www/gforge-projects/mongrel/coverage/ }
 end
 
 task :site_projects_rdoc do
@@ -53,35 +53,34 @@ task :site => [:site_webgen, :site_rdoc, :site_coverage, :site_projects_rdoc]
 setup_extension("http11", "http11")
 
 name="mongrel"
-version="0.3.13.4"
+version="1.0"
 
 setup_gem(name, version) do |spec|
-  spec.summary = "A small fast HTTP library and server that runs Rails, Camping, and Nitro apps."
+  spec.summary = "A small fast HTTP library and server that runs Rails, Camping, Nitro and Iowa apps."
   spec.description = spec.summary
   spec.test_files = Dir.glob('test/test_*.rb')
   spec.author="Zed A. Shaw"
   spec.executables=['mongrel_rails']
-  spec.files += %w(ext/http11/MANIFEST README Rakefile setup.rb)
+  spec.files += %w(ext/http11/MANIFEST README Rakefile setup.rb lib/mongrel/mime_types.yml)
 
   spec.required_ruby_version = '>= 1.8.4'
 
   if RUBY_PLATFORM =~ /mswin/
-    Dir.chdir "projects/mongrel_service" do
-      `rake.cmd install`
-    end
-    spec.files += ['ext/http11/http11.so']
     spec.files += ['lib/http11.so']
     spec.extensions.clear
     spec.platform = Gem::Platform::WIN32
   else
-    spec.add_dependency('daemons', '>= 0.4.2')
+    spec.add_dependency('daemons', '>= 1.0.3')
+    spec.add_dependency('fastthread', '>= 0.6.2')
   end
   
-  spec.add_dependency('gem_plugin', '>= 0.2.1')
+  spec.add_dependency('gem_plugin', '>= 0.2.2')
+  spec.add_dependency('cgi_multipart_eof_fix', '>= 1.0.0')
 end
 
 task :install do
   sub_project("gem_plugin", :install)
+  sub_project("fastthread", :install)
   sh %{rake package}
   sh %{gem install pkg/mongrel-#{version}}
   sub_project("mongrel_status", :install)
@@ -99,6 +98,7 @@ task :uninstall => [:clean] do
   sub_project("mongrel_console", :uninstall)
   sh %{gem uninstall mongrel}
   sub_project("gem_plugin", :uninstall)
+  sub_project("fastthread", :uninstall)
   if RUBY_PLATFORM =~ /mswin/
     sub_project("mongrel_service", :install)
   end
@@ -112,6 +112,6 @@ task :gem_source do
   FileList["pkg/*.tgz"].each {|tgz| rm tgz }
   rm_rf "pkg/#{name}-#{version}"
 
-  sh %{ generate_yaml_index.rb -d pkg }
-  sh %{ scp -r pkg/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/releases/ }
+  sh %{ index_gem_repository.rb -d pkg }
+  sh %{ scp -r ChangeLog pkg/* rubyforge.org:/var/www/gforge-projects/mongrel/releases/ }
 end

data/bin/mongrel_rails

@@ -9,6 +9,7 @@ require 'yaml'
 require 'mongrel'
 require 'mongrel/rails'
 require 'etc'
+require 'cgi_multipart_eof_fix' rescue nil
 
 module Mongrel
   class Start < GemPlugin::Plugin "/commands"
@@ -17,7 +18,7 @@ module Mongrel
     def configure
       options [
         ["-e", "--environment ENV", "Rails environment to run as", :@environment, ENV['RAILS_ENV'] || "development"],
-        ["-d", "--daemonize", "Whether to run in the background or not", :@daemon, false],
+        ["-d", "--daemonize", "Run daemonized in the background", :@daemon, false],
         ['-p', '--port PORT', "Which port to bind to", :@port, 3000],
         ['-a', '--address ADDR', "Address to bind to", :@address, "0.0.0.0"],
         ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
@@ -29,8 +30,8 @@ module Mongrel
         ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, "public"],
         ['-B', '--debug', "Enable debugging mode", :@debug, false],
         ['-C', '--config PATH', "Use a config file", :@config_file, nil],
-        ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil],
-        ['-G', '--generate CONFIG', "Generate a config file for -C", :@generate, nil],
+        ['-S', '--script PATH', "Load the given file as an extra config script", :@config_script, nil],
+        ['-G', '--generate PATH', "Generate a config file for use with -C", :@generate, nil],
         ['', '--user USER', "User to run as", :@user, nil],
         ['', '--group GROUP', "Group to run as", :@group, nil],
         ['', '--prefix PATH', "URL prefix for Rails app", :@prefix, nil]
@@ -41,7 +42,7 @@ module Mongrel
       @cwd = File.expand_path(@cwd)
       valid_dir? @cwd, "Invalid path to change to during daemon mode: #@cwd"
 
-      # change there to start, then we'll have to come back after daemonize
+      # Change there to start, then we'll have to come back after daemonize
       Dir.chdir(@cwd)
 
       valid?(@prefix[0].chr == "/" && @prefix[-1].chr != "/", "Prefix must begin with / and not end in /") if @prefix
@@ -57,10 +58,8 @@ module Mongrel
       return @valid
     end
 
-
     def run
-
-      # command line setting override config file settings
+      # Config file settings will override command line settings
       settings = { :host => @address,  :port => @port, :cwd => @cwd,
         :log_file => @log_file, :pid_file => @pid_file, :environment => @environment,
         :docroot => @docroot, :mime_map => @mime_map, :daemon => @daemon,
@@ -70,22 +69,23 @@ module Mongrel
       }
 
       if @generate
-        STDERR.puts "** Writing config to #@generate"
+        STDERR.puts "** Writing config to \"#@generate\"."
         open(@generate, "w") {|f| f.write(settings.to_yaml) }
-        STDERR.puts "## Exiting. Re-run without -G and WITH -C using your new config file."
+        STDERR.puts "** Finished.  Run \"mongrel_rails -C #@generate\" to use the config file."
         exit 0
       end
 
       if @config_file
-        conf = YAML.load_file(@config_file)
-        settings = settings.merge! conf
+        settings.merge! YAML.load_file(@config_file)
         STDERR.puts "** Loading settings from #{@config_file} (they override command line)." unless settings[:daemon]
       end
 
       config = Mongrel::Rails::RailsConfigurator.new(settings) do
         if defaults[:daemon]
           if File.exist? defaults[:pid_file]
-            log "!!! PID file #{defaults[:pid_file]} already exists.  Mongrel could be running already. Check your #{defaults[:log_file]} for errors."
+            log "!!! PID file #{defaults[:pid_file]} already exists.  Mongrel could be running already.  Check your #{defaults[:log_file]} for errors."
+            log "!!! Exiting with error.  You must stop mongrel and clear the .pid before I'll attempt a start."
+            exit 1
           end
 
           daemonize
@@ -103,7 +103,7 @@ module Mongrel
           end
 
           if defaults[:debug]
-            log "Installing debugging prefixed filters.  Look in log/mongrel_debug for the files."
+            log "Installing debugging prefixed filters. Look in log/mongrel_debug for the files."
             debug "/"
           end
 
@@ -139,7 +139,15 @@ module Mongrel
         if RUBY_PLATFORM !~ /mswin/
           cmd = "ruby #{__FILE__} start #{original_args.join(' ')}"
           config.log "Restarting with arguments:  #{cmd}"
-          exec cmd
+          config.stop
+          config.remove_pid_file
+
+          if config.defaults[:daemon]
+            system cmd
+          else
+            STDERR.puts "Can't restart unless in daemon mode."
+            exit 1
+          end
         else
           config.log "Win32 does not support restarts. Exiting."
         end
@@ -165,9 +173,10 @@ module Mongrel
 
     def configure 
       options [ 
-        ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, "."],
-        ['-f', '--force', "Force the shutdown.", :@force, false],
-        ['-P', '--pid FILE', "Where the PID file is located", :@pid_file, "log/mongrel.pid"]
+        ['-c', '--chdir PATH', "Change to dir before starting (will be expanded).", :@cwd, "."],
+        ['-f', '--force', "Force the shutdown (kill -9).", :@force, false],
+        ['-w', '--wait SECONDS', "Wait SECONDS before forcing shutdown", :@wait, "0"], 
+        ['-P', '--pid FILE', "Where the PID file is located.", :@pid_file, "log/mongrel.pid"]
       ]
     end
 
@@ -177,14 +186,18 @@ module Mongrel
 
       Dir.chdir @cwd
 
-      valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?" 
+      valid_exists? @pid_file, "PID file #@pid_file does not exist.  Not running?"
       return @valid
     end
 
-
     def run
       if @force
-        Mongrel::send_signal("KILL", @pid_file)
+        @wait.to_i.times do |waiting|
+          exit(0) if not File.exist? @pid_file
+          sleep 1
+        end
+
+        Mongrel::send_signal("KILL", @pid_file) if File.exist? @pid_file
       else
         Mongrel::send_signal("TERM", @pid_file)
       end
@@ -192,7 +205,6 @@ module Mongrel
   end
 
 
-
   class Restart < GemPlugin::Plugin "/commands"
     include Mongrel::Command::Base
 
@@ -210,11 +222,10 @@ module Mongrel
 
       Dir.chdir @cwd
 
-      valid_exists? @pid_file, "PID file #@pid_file does not exist. Not running?" 
+      valid_exists? @pid_file, "PID file #@pid_file does not exist.  Not running?"
       return @valid
     end
 
-
     def run
       if @soft
         Mongrel::send_signal("HUP", @pid_file)
@@ -228,6 +239,7 @@ end
 
 GemPlugin::Manager.instance.load "mongrel" => GemPlugin::INCLUDE, "rails" => GemPlugin::EXCLUDE
 
+
 if not Mongrel::Command::Registry.instance.run ARGV
   exit 1
 end

data/doc/rdoc/classes/IO.html

@@ -86,8 +86,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000002">close</a>&nbsp;&nbsp;
-      <a href="#M000001">open</a>&nbsp;&nbsp;
+      <a href="#M000004">close</a>&nbsp;&nbsp;
+      <a href="#M000003">open</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -107,12 +107,12 @@
                         <table summary="aliases">
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">open</td>
-          <td>-></td>
+          <td>-&gt;</td>
           <td class="context-item-value">orig_open</td>
         </tr>
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">close</td>
-          <td>-></td>
+          <td>-&gt;</td>
           <td class="context-item-value">orig_close</td>
         </tr>
                         </table>
@@ -127,12 +127,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000002" class="method-detail">
-        <a name="M000002"></a>
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
 
         <div class="method-heading">
-          <a href="IO.src/M000002.html" target="Code" class="method-signature"
-            onclick="popupCode('IO.src/M000002.html');return false;">
+          <a href="IO.src/M000004.html" target="Code" class="method-signature"
+            onclick="popupCode('IO.src/M000004.html');return false;">
           <span class="method-name">close</span><span class="method-args">(*arg,&amp;blk)</span>
           </a>
         </div>
@@ -141,12 +141,12 @@
         </div>
       </div>
 
-      <div id="method-M000001" class="method-detail">
-        <a name="M000001"></a>
+      <div id="method-M000003" class="method-detail">
+        <a name="M000003"></a>
 
         <div class="method-heading">
-          <a href="IO.src/M000001.html" target="Code" class="method-signature"
-            onclick="popupCode('IO.src/M000001.html');return false;">
+          <a href="IO.src/M000003.html" target="Code" class="method-signature"
+            onclick="popupCode('IO.src/M000003.html');return false;">
           <span class="method-name">open</span><span class="method-args">(*arg, &amp;blk)</span>
           </a>
         </div>

data/doc/rdoc/classes/Kernel.html

@@ -80,8 +80,8 @@
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000011">log_open_files</a>&nbsp;&nbsp;
-      <a href="#M000010">open</a>&nbsp;&nbsp;
+      <a href="#M000013">log_open_files</a>&nbsp;&nbsp;
+      <a href="#M000012">open</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -101,7 +101,7 @@
                         <table summary="aliases">
         <tr class="top-aligned-row context-row">
           <td class="context-item-name">open</td>
-          <td>-></td>
+          <td>-&gt;</td>
           <td class="context-item-value">orig_open</td>
         </tr>
                         </table>
@@ -116,12 +116,12 @@
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000011" class="method-detail">
-        <a name="M000011"></a>
+      <div id="method-M000013" class="method-detail">
+        <a name="M000013"></a>
 
         <div class="method-heading">
-          <a href="Kernel.src/M000011.html" target="Code" class="method-signature"
-            onclick="popupCode('Kernel.src/M000011.html');return false;">
+          <a href="Kernel.src/M000013.html" target="Code" class="method-signature"
+            onclick="popupCode('Kernel.src/M000013.html');return false;">
           <span class="method-name">log_open_files</span><span class="method-args">()</span>
           </a>
         </div>
@@ -130,12 +130,12 @@
         </div>
       </div>
 
-      <div id="method-M000010" class="method-detail">
-        <a name="M000010"></a>
+      <div id="method-M000012" class="method-detail">
+        <a name="M000012"></a>
 
         <div class="method-heading">
-          <a href="Kernel.src/M000010.html" target="Code" class="method-signature"
-            onclick="popupCode('Kernel.src/M000010.html');return false;">
+          <a href="Kernel.src/M000012.html" target="Code" class="method-signature"
+            onclick="popupCode('Kernel.src/M000012.html');return false;">
           <span class="method-name">open</span><span class="method-args">(*arg, &amp;blk)</span>
           </a>
         </div>