thin 0.7.1 → 0.8.0

data/CHANGELOG

@@ -1,3 +1,18 @@
+== 0.8.0 Dodgy Dentist release
+ * Fix server crash when header too large.
+ * Add --require (-r) option to require a library, before executing your script.
+ * Rename --rackup short option to -R, warn and load as rackup when file ends with .ru.
+ * List supported adapters in command usage.
+ * Add file adapter to built-in adapter, serve static files in current directory.
+ * Allow disabling signal handling in Server with :signals => false
+ * Make Server.new arguments more flexible, can now specify any of host, port, app or hash options.
+ * Add --backend option to specified which backend to use, closes #55
+ * Serve static file only on GET and HEAD requests in Rails adapter, fixes #58
+ * Add threaded option to run server in threaded mode, calling the application in a
+   thread allowing for concurrency in the Rack adapter, closes #46
+ * Guess which adapter to use from directory (chdir option)
+   or use specified one in 'adapter' option, re #47.
+
 == 0.7.1 Fancy Pants release
  * Clean stale PID files when starting as daemon, fixes #53 [Chu Yeow]
  * Require EventMachine 0.11.0 for UNIX domain sockets. Until it's released, install from:

data/README

@@ -9,11 +9,13 @@ Thin is a Ruby web server that glues together 3 of the best Ruby libraries in we
 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.
 
-=== Installation
-IMPORTANT: Until EventMachine 0.11.0 is out, you have to install it from trunk or from my gem server:
-
- sudo gem install eventmachine --source http://code.macournoyer.com
+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
@@ -28,6 +30,10 @@ Or from source:
  cd thin
  rake install
 
+To use Thin with UNIX domain sockets you need EventMachine 0.11.0 from my gem server:
+
+ gem install eventmachine --source http://code.macournoyer.com
+
 === Usage
 A +thin+ script offers an easy way to start your Rails application:
 

data/example/thin_solaris_smf.erb

@@ -0,0 +1,36 @@
+<?xml version='1.0'?>
+<!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<service_bundle type='manifest' name='thin/<%= service_name %>-production'>
+  <service name='network/thin/<%= service_name %>-production' type='service' version='0'>
+    <!-- Dependancies for all Thin servers. -->
+    <dependency name='fs' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/system/filesystem/local'/>
+    </dependency>
+    <dependency name='net' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/network/loopback'/>
+      <!-- uncomment the following line if you are on an L+ Accelerator since /home is mounted through nfs -->
+      <!--<service_fmri value='svc:/network/nfs/client'/>-->
+    </dependency>
+    <% 0.upto(thin_max_instances - 1) do |instance| %>
+    <!-- instance names can't start with digits. Bummer. -->
+    <instance name='i_<%= instance.to_s %>' enabled='false'>
+      <!-- Cause the multi-user milestone to bring these services up -->
+      <dependent name='<%= service_name %>_<%= instance.to_s %>_multi-user' restart_on='none' grouping='optional_all'>
+        <service_fmri value='svc:/milestone/multi-user'/>
+      </dependent>
+      <exec_method name='start' type='method'
+            exec='/opt/csw/bin/thin -C config/thin.yml --only <%= instance.to_s %> start'
+            timeout_seconds='10'>
+        <method_context working_directory='<%= working_directory %>'>
+          <method_credential user='<%= user %>' group='<%= group %>' />
+          <method_environment>
+            <envvar name='PATH' value='/usr/bin:/bin:/opt/csw/bin' />
+          </method_environment>
+        </method_context>
+      </exec_method>
+      <exec_method name='stop' type='method' exec=':kill' timeout_seconds='10' />
+    </instance>
+    <% end %>
+  </service>
+</service_bundle>
+

data/example/thin_solaris_smf.readme.txt

@@ -0,0 +1,150 @@
+Using Thin with Solaris' SMF Monitoring Framework
+- - - - - - - - - - - - - - - - - - - - - - - - -
+
+Solaris uses the Service Management Framework (SMF) at the OS level to manage, monitor, and restart long running processes.  This replaces init scripts, and tools like monit and god.
+
+The sample XML file (thin_solaris_smf.erb) is an example SMF manifest which I use on a Joyent accelerator which runs on OpenSolaris.
+
+This setup will:
+
+- ensure the right dependencies are loaded
+- start n instances of Thin, and monitor each individually.  If any single one dies it will be restarted instantly (test it by killing a single thin instance and it will be back alive before you can type 'ps -ef').
+
+This is better than using clustering since if you start the cluster with SMF it will only notice a problem and restart individual Thin's if ALL of them are dead, at which point it will restart the whole cluster.  This approach makes sure that all of your Thins start together and are monitored and managed independant of each other.  This problem likely exists if you are using god or monit to monitor only the start of the master cluster, and don't then monitor the individual processes started.
+
+This example is in .erb format instead of plain XML since I dynamically generate this file as part of a Capistrano deployment.  In my deploy.rb file I define the variables found in this erb.  Of course you don't need to use this with Capistrano.  Just replace the few ERB variables from the xml file, change its extension, and load that directly in Solaris if you prefer.
+
+Here are some examples for usage to get you started with Capistrano, and Thin:
+
+FILE : config/deploy.rb
+--
+
+  require 'config/accelerator/accelerator_tasks'
+
+  set :application, "yourapp"
+  set :svcadm_bin, "/usr/sbin/svcadm"
+  set :svccfg_bin, "/usr/sbin/svccfg"
+  set :svcs_bin, "/usr/bin/svcs"
+
+  # gets the list of remote service SMF names that we need to start
+  # like (depending on thin_max_instances settings):
+  # svc:/network/thin/yourapp-production:i_0
+  # svc:/network/thin/yourapp-production:i_1
+  # svc:/network/thin/yourapp-production:i_2
+  set :service_list, "`svcs -H -o FMRI svc:network/thin/#{application}-production`"
+
+  # how many Thin instances should be setup to run?
+  # this affects the generated thin smf file, and the nginx vhost conf
+  # need to re-run setup for thin smf and nginx vhost conf when changed
+  set :thin_max_instances, 3
+
+  # OVERRIDE STANDARD TASKS
+  desc "Restart the entire application"
+  deploy.task :restart do
+    accelerator.thin.restart
+    accelerator.nginx.restart
+  end
+
+  desc "Start the entire application"
+  deploy.task :start do
+    accelerator.thin.restart
+    accelerator.nginx.restart
+  end
+
+  desc "Stop the entire application"
+  deploy.task :stop do
+    accelerator.thin.disable
+    accelerator.nginx.disable
+  end
+
+
+FILE : config/accelerator/accelerator_tasks.rb
+--
+
+    desc "Create and deploy Thin SMF config"
+    task :create_thin_smf, :roles => :app do
+      service_name = application
+      working_directory = current_path
+      template = File.read("config/accelerator/thin_solaris_smf.erb")
+      buffer = ERB.new(template).result(binding)
+      put buffer, "#{shared_path}/#{application}-thin-smf.xml"
+      sudo "#{svccfg_bin} import #{shared_path}/#{application}-thin-smf.xml"
+    end
+
+    desc "Delete Thin SMF config"
+    task :delete_thin_smf, :roles => :app do
+      accelerator.thin.disable
+      sudo "#{svccfg_bin} delete /network/thin/#{application}-production"
+    end
+
+    desc "Show all SMF services"
+    task :svcs do
+      run "#{svcs_bin} -a" do |ch, st, data|
+        puts data
+      end
+    end
+
+    desc "Shows all non-functional SMF services"
+    task :svcs_broken do
+      run "#{svcs_bin} -vx" do |ch, st, data|
+        puts data
+      end
+    end
+
+
+    namespace :thin do
+
+      desc "Disable all Thin servers"
+      task :disable, :roles => :app do
+        # temporarily disable, until next reboot (-t)
+        sudo "#{svcadm_bin} disable -t #{service_list}"
+      end
+
+      desc "Enable all Thin servers"
+      task :enable, :roles => :app do
+        # start the app with all recursive dependencies
+        sudo "#{svcadm_bin} enable -r #{service_list}"
+      end
+
+      desc "Restart all Thin servers"
+      task :restart, :roles => :app do
+        # svcadm restart doesn't seem to work right, so we'll brute force it
+        disable
+        enable
+      end
+
+    end # namespace thin
+
+
+FILE : config/thin.yml
+--
+
+---
+pid: tmp/pids/thin.pid
+socket: /tmp/thin.sock
+log: log/thin.log
+max_conns: 1024
+timeout: 30
+chdir: /your/app/dir/rails/root
+environment: production
+max_persistent_conns: 512
+daemonize: true
+servers: 3
+
+
+FILE : config/accelerator/thin_solaris_smf.erb
+--
+This is of course an example.  It works for me, but YMMV
+
+You may need to change this line to match your environment and config:
+  exec='/opt/csw/bin/thin -C config/thin.yml --only <%= instance.to_s %> start'
+
+
+CONTRIBUTE:
+
+If you see problems or enhancements for this approach please send me an email at glenn [at] rempe dot us.  Sadly, I won't be able to provide support for this example as time and my limited Solaris admin skills won't allow.
+
+Cheers,
+
+Glenn Rempe
+2008/03/20

data/ext/thin_parser/common.rl

@@ -11,11 +11,12 @@
   safe = ("$" | "-" | "_" | ".");
   extra = ("!" | "*" | "'" | "(" | ")" | ",");
   reserved = (";" | "/" | "?" | ":" | "@" | "&" | "=" | "+");
-  unsafe = (CTL | " " | "\"" | "#" | "%" | "<" | ">");
+  sorta_safe = ("\"" | "<" | ">");
+  unsafe = (CTL | " " | "#" | "%" | sorta_safe);
   national = any -- (alpha | digit | reserved | extra | safe | unsafe);
   unreserved = (alpha | digit | safe | extra | national);
   escape = ("%" xdigit xdigit);
-  uchar = (unreserved | escape);
+  uchar = (unreserved | escape | sorta_safe);
   pchar = (uchar | ":" | "@" | "&" | "=" | "+");
   tspecials = ("(" | ")" | "<" | ">" | "@" | "," | ";" | ":" | "\\" | "\"" | "/" | "[" | "]" | "?" | "=" | "{" | "}" | " " | "\t");
 

data/ext/thin_parser/parser.c

@@ -484,15 +484,11 @@ case 20:
 #line 485 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr30;
+		case 35: goto st0;
 		case 37: goto tr31;
-		case 60: goto st0;
-		case 62: goto st0;
 		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st0;
-	} else if ( (*p) >= 0 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto tr29;
 tr29:
@@ -503,18 +499,14 @@ st21:
 	if ( ++p == pe )
 		goto _out21;
 case 21:
-#line 507 "parser.c"
+#line 503 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr30;
+		case 35: goto st0;
 		case 37: goto st22;
-		case 60: goto st0;
-		case 62: goto st0;
 		case 127: goto st0;
 	}
-	if ( (*p) > 31 ) {
-		if ( 34 <= (*p) && (*p) <= 35 )
-			goto st0;
-	} else if ( (*p) >= 0 )
+	if ( 0 <= (*p) && (*p) <= 31 )
 		goto st0;
 	goto st21;
 tr31:
@@ -525,7 +517,7 @@ st22:
 	if ( ++p == pe )
 		goto _out22;
 case 22:
-#line 529 "parser.c"
+#line 521 "parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st23;
@@ -556,7 +548,7 @@ st24:
 	if ( ++p == pe )
 		goto _out24;
 case 24:
-#line 560 "parser.c"
+#line 552 "parser.c"
 	switch( (*p) ) {
 		case 43: goto st24;
 		case 58: goto st25;
@@ -581,14 +573,11 @@ st25:
 	if ( ++p == pe )
 		goto _out25;
 case 25:
-#line 585 "parser.c"
+#line 577 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
-		case 34: goto st0;
 		case 35: goto tr9;
 		case 37: goto st26;
-		case 60: goto st0;
-		case 62: goto st0;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
@@ -628,15 +617,12 @@ st28:
 	if ( ++p == pe )
 		goto _out28;
 case 28:
-#line 632 "parser.c"
+#line 621 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr40;
-		case 34: goto st0;
 		case 35: goto tr41;
 		case 37: goto st29;
 		case 59: goto tr43;
-		case 60: goto st0;
-		case 62: goto st0;
 		case 63: goto tr44;
 		case 127: goto st0;
 	}
@@ -681,14 +667,11 @@ st31:
 	if ( ++p == pe )
 		goto _out31;
 case 31:
-#line 685 "parser.c"
+#line 671 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr8;
-		case 34: goto st0;
 		case 35: goto tr9;
 		case 37: goto st32;
-		case 60: goto st0;
-		case 62: goto st0;
 		case 63: goto st34;
 		case 127: goto st0;
 	}
@@ -733,14 +716,11 @@ st34:
 	if ( ++p == pe )
 		goto _out34;
 case 34:
-#line 737 "parser.c"
+#line 720 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr51;
-		case 34: goto st0;
 		case 35: goto tr52;
 		case 37: goto tr53;
-		case 60: goto st0;
-		case 62: goto st0;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
@@ -754,14 +734,11 @@ st35:
 	if ( ++p == pe )
 		goto _out35;
 case 35:
-#line 758 "parser.c"
+#line 738 "parser.c"
 	switch( (*p) ) {
 		case 32: goto tr55;
-		case 34: goto st0;
 		case 35: goto tr56;
 		case 37: goto st36;
-		case 60: goto st0;
-		case 62: goto st0;
 		case 127: goto st0;
 	}
 	if ( 0 <= (*p) && (*p) <= 31 )
@@ -775,7 +752,7 @@ st36:
 	if ( ++p == pe )
 		goto _out36;
 case 36:
-#line 779 "parser.c"
+#line 756 "parser.c"
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
 			goto st37;
@@ -1205,7 +1182,7 @@ case 56:
   if(parser->body_start) {
     /* final \r\n combo encountered so stop right here */
     
-#line 1209 "parser.c"
+#line 1186 "parser.c"
 #line 130 "parser.rl"
     parser->nread++;
   }
@@ -1218,7 +1195,7 @@ int http_parser_finish(http_parser *parser)
   int cs = parser->cs;
 
   
-#line 1222 "parser.c"
+#line 1199 "parser.c"
 #line 141 "parser.rl"
 
   parser->cs = cs;

data/lib/rack/adapter/loader.rb

@@ -0,0 +1,69 @@
+module Rack
+  class AdapterNotFound < RuntimeError; end
+
+  # Hash used to guess which adapter to use in <tt>Adapter.for</tt>.
+  # Framework name => file unique to this framework.
+  # +nil+ for value to never guess.
+  ADAPTERS = {
+    :rails   => "config/environment.rb",
+    :ramaze  => "start.rb",
+    :merb    => "config/init.rb",
+    :halcyon => 'runner.ru',
+    :file    => nil
+  }
+    
+  module Adapter    
+    # Guess which adapter to use based on the directory structure
+    # or file content.
+    # Returns a symbol representing the name of the adapter to use
+    # to load the application under <tt>dir/</tt>.
+    def self.guess(dir)
+      ADAPTERS.each_pair do |adapter, file|
+        return adapter if file && ::File.exist?(::File.join(dir, file))
+      end
+      raise AdapterNotFound, "No adapter found for #{dir}"
+    end
+    
+    # Loads an adapter identified by +name+ using +options+ hash.
+    def self.for(name, options={})
+      case name.to_sym
+      when :rails
+        return Rails.new(options.merge(:root => options[:chdir]))
+      
+      when :ramaze
+        require "#{options[:chdir]}/start"
+
+        Ramaze.trait[:essentials].delete Ramaze::Adapter
+        Ramaze.start :force => true
+
+        return Ramaze::Adapter::Base
+
+      when :merb
+        require 'merb-core'
+
+        Merb::Config.setup(:merb_root   => options[:chdir],
+                           :environment => options[:environment])
+        Merb.environment = Merb::Config[:environment]
+        Merb.root = Merb::Config[:merb_root]
+        Merb::BootLoader.run
+
+        return Merb::Rack::Application.new
+      
+      when :halcyon
+        require 'halcyon'
+        
+        $:.unshift(Halcyon.root/'lib')
+        Halcyon::Runner.load_config Halcyon.root/'config'/'config.yml'
+        
+        return Halcyon::Runner.new
+      
+      when :file
+        return Rack::File.new(options[:chdir])
+      
+      else
+        raise AdapterNotFound, "Adapter not found: #{name}"
+        
+      end
+    end
+  end
+end