mongrel2 0.32.0 → 0.33.0

data/ChangeLog

@@ -1,8 +1,44 @@
+2012-09-21  Michael Granger  <ged@FaerieMUD.org>
+
+	* spec/lib/helpers.rb:
+	Use Loggability's spec helpers
+	[36f9259ea9aa] [tip]
+
+	* lib/mongrel2/request.rb:
+	Don't log the whole damn request in debugging
+	[6767558cf718]
+
+2012-09-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.32.0 for changeset 784babdfb85c
+	[d7f1ccc8c130]
+
+	* .hgsigs:
+	Added signature for changeset ebfb060e8c65
+	[784babdfb85c] [v0.32.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[ebfb060e8c65]
+
+	* .hgignore:
+	Ignore foreman settings files
+	[16b910708f91]
+
+	* bin/m2sh.rb:
+	Add a settings command for showing "expert" settings
+	[09884906b249]
+
+	* .rvm.gems, Rakefile:
+	Updating dependencies
+	[7a901c95b004]
+
 2012-08-20  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.31.1 for changeset 54464cda5795
-	[933a499629d1] [tip]
+	[933a499629d1]
 
 	* .hgsigs:
 	Added signature for changeset a66bb80de490

data/History.rdoc

@@ -1,3 +1,10 @@
+== v0.33.0 [2012-10-02] Michael Granger <ged@FaerieMUD.org>
+
+- Implement deferred signal-handling for Mongrel2::Handler
+- Update the examples/
+- Squelch some of the noisier debug logging
+
+
 == v0.32.0 [2012-09-18] Michael Granger <ged@FaerieMUD.org>
 
 - Add a settings command for showing "expert" settings to m2sh.rb.

data/data/mongrel2/bootstrap.html

@@ -18,14 +18,16 @@
 			<li><a href="/hello">Hello World</a> (<a href="/source/helloworld-handler.rb">source</a>) </li>
 			<li><a href="/async-upload">Async Upload Demo</a>
 				(<a href="/source/async-upload.rb">source</a>) </li>
-			<li><a href="/dump">Dump Request</a> (<a href="/source/request-dumper.rb">source</a>) </li>
-			<li><a href="/websock-test.html">Web Socket Test</a></li>
+			<li><a href="/dump">Dump Request</a> 
+				(<a href="/source/request-dumper.rb">source</a>) </li>
+			<li><a href="/websock-test.html">Web Socket Test</a> 
+				(<a href="/source/ws-echo.rb">source</a>)</li>
 		</ol>
 	</section>
 
 	<footer>
 		<p>Copyright © 2011-2012 Michael Granger &lt;<a href="mailto:ged@FaerieMUD.org">ged@FaerieMUD.org</a>&gt;.</p>
-		<p><tt>$Id: bootstrap.html,v 0b20bfda9eea 2012/05/22 00:34:22 ged $</tt></p>
+		<p><tt>$Id: bootstrap.html,v 4c64666f4255 2012/10/03 00:42:35 ged $</tt></p>
 	</footer>
 </body>
 </html>

data/examples/async-upload.rb

@@ -26,7 +26,7 @@ class AsyncUploadHandler < Mongrel2::Handler
 
 
 	### Mongrel2 async upload callback -- allow uploads to proceed.
-	def handle_upload_start( request )
+	def handle_async_upload_start( request )
 		self.log.info "Upload started: %s" % [ request.header.x_mongrel2_upload_start ]
 		return nil # Do nothing
 	end
@@ -52,12 +52,8 @@ class AsyncUploadHandler < Mongrel2::Handler
 
 	### Regular request -- show the upload form.
 	def handle( request )
-		# If it's the 'upload started' notification, use that handler method
-		if request.upload_started?
-			return self.handle_upload_start( request )
-
 		# If it's a finished upload, use that handler method
-		elsif request.upload_done?
+		if request.upload_done?
 			return self.handle_upload_done( request )
 
 		else

data/lib/mongrel2/connection.rb

@@ -69,12 +69,12 @@ class Mongrel2::Connection
 		self.log.debug "0mq Context is: %p" % [ ctx ]
 
 		self.log.info "Connecting PULL request socket (%s)" % [ self.sub_addr ]
-		@request_sock  = ctx.socket( ZMQ::PULL )
+		@request_sock = ctx.socket( ZMQ::PULL )
 		@request_sock.setsockopt( ZMQ::LINGER, 0 )
 		@request_sock.connect( self.sub_addr )
 
 		self.log.info "Connecting PUB response socket (%s)" % [ self.pub_addr ]
-		@response_sock  = ctx.socket( ZMQ::PUB )
+		@response_sock = ctx.socket( ZMQ::PUB )
 		@response_sock.setsockopt( ZMQ::IDENTITY, self.identifier )
 		@response_sock.setsockopt( ZMQ::LINGER, 0 )
 		@response_sock.connect( self.pub_addr )

data/lib/mongrel2/handler.rb

@@ -90,6 +90,13 @@ class Mongrel2::Handler
 	log_to :mongrel2
 
 
+	# Signals we handle
+	QUEUE_SIGS = [
+		:INT, :TERM, :HUP, :USR1,
+		# :TODO: :QUIT, :WINCH, :USR2, :TTIN, :TTOU
+	]
+
+
 	### Create an instance of the handler using the config from the database with
 	### the given +appid+ and run it.
 	def self::run( appid )
@@ -121,6 +128,8 @@ class Mongrel2::Handler
 	def initialize( app_id, send_spec, recv_spec ) # :notnew:
 		@app_id = app_id
 		@conn   = Mongrel2::Connection.new( app_id, send_spec, recv_spec )
+
+		Thread.main[:signal_queue] = []
 	end
 
 
@@ -158,7 +167,9 @@ class Mongrel2::Handler
 	### Shut down the handler.
 	def shutdown
 		self.log.info "Shutting down."
+		self.ignore_signals
 		@conn.close
+		Mongrel2.zmq_context.close
 	end
 
 
@@ -176,25 +187,35 @@ class Mongrel2::Handler
 	### Start a loop, accepting a request and handling it.
 	def start_accepting_requests
 		until @conn.closed?
-			req = @conn.receive
-			self.log.info( req.inspect )
-			res = self.dispatch_request( req )
-
-			if res
-				self.log.info( res.inspect )
-				@conn.reply( res ) unless @conn.closed?
-			end
+			ZMQ.select([ @conn.request_sock ])
+			self.accept_request unless @conn.closed?
 		end
 	rescue ZMQ::Error => err
+		self.process_signal_queue
+
 		unless @conn.closed?
 			self.log.error "%p while accepting requests: %s" % [ err.class, err.message ]
 			self.log.debug { err.backtrace.join("\n  ") }
 
+			# Restart the method
 			retry
 		end
 	end
 
 
+	### Read a request from the connection and dispatch it.
+	def accept_request
+		req = @conn.receive
+		self.log.info( req.inspect )
+		res = self.dispatch_request( req )
+
+		if res
+			self.log.info( res.inspect )
+			@conn.reply( res ) unless @conn.closed?
+		end
+	end
+
+
 	### Invoke a handler method appropriate for the given +request+.
 	def dispatch_request( request )
 		if request.is_disconnect?
@@ -329,6 +350,10 @@ class Mongrel2::Handler
 	end
 
 
+	#########
+	protected
+	#########
+
 	#
 	# :section: Signal Handling
 	# These methods set up some behavior for starting, restarting, and stopping
@@ -336,43 +361,77 @@ class Mongrel2::Handler
 	# be handled, override #set_signal_handlers with an empty method.
 	#
 
-	### Set up signal handlers for SIGINT, SIGTERM, SIGINT, and SIGUSR1 that will call the
-	### #on_hangup_signal, #on_termination_signal, #on_interrupt_signal, and
-	### #on_user1_signal methods, respectively.
+	### Set up signal handlers for common signals that will shut down, restart, etc.
 	def set_signal_handlers
-		Signal.trap( :HUP,  &self.method(:on_hangup_signal) )
-		Signal.trap( :TERM, &self.method(:on_termination_signal) )
-		Signal.trap( :INT,  &self.method(:on_interrupt_signal) )
-		Signal.trap( :USR1, &self.method(:on_user1_signal) )
+		self.log.debug "Setting up deferred signal handlers."
+		QUEUE_SIGS.each do |sig|
+			Signal.trap( sig ) { Thread.main[:signal_queue] << sig }
+		end
 	end
 
 
-	### Restore the default signal handlers
+	### Set all signal handlers to ignore.
+	def ignore_signals
+		self.log.debug "Ignoring signals."
+		QUEUE_SIGS.each do |sig|
+			Signal.trap( sig, :IGNORE )
+		end
+	end
+
+
+	### Set the signal handlers back to their defaults.
 	def restore_signal_handlers
-		Signal.trap( :HUP,  :DEFAULT )
-		Signal.trap( :TERM, :DEFAULT )
-		Signal.trap( :INT,  :DEFAULT )
-		Signal.trap( :USR1, :DEFAULT )
+		self.log.debug "Restoring default signal handlers."
+		QUEUE_SIGS.each do |sig|
+			Signal.trap( sig, :DEFAULT )
+		end
 	end
 
+	### Handle any queued signals.
+	def process_signal_queue
+		# Look for any signals that arrived and handle them
+		while sig = Thread.main[:signal_queue].shift
+			self.handle_signal( sig )
+		end
+	end
+
+
+	### Handle signals.
+	def handle_signal( sig )
+		self.log.debug "Handling signal %s" % [ sig ]
+		case sig
+		when :INT, :TERM
+			self.on_termination_signal( sig )
+
+		when :HUP
+			self.on_hangup_signal( sig )
+
+		when :USR1
+			self.on_user1_signal( sig )
+
+		else
+			self.log.warn "Unhandled signal %s" % [ sig ]
+		end
 
-	### Handle a HUP signal. The default is to restart the handler.
-	def on_hangup_signal( signo )
-		self.log.warn "Hangup: reconnecting."
-		self.restart
 	end
 
 
 	### Handle a TERM signal. Shuts the handler down after handling any current request/s. Also
 	### aliased to #on_interrupt_signal.
 	def on_termination_signal( signo )
-		self.log.warn "Halting on signal #{signo} (Thread: %p vs. main: %p)" %
-			[ Thread.current, Thread.main ]
+		self.log.warn "Terminated (%p)" % [ signo ]
 		self.shutdown
 	end
 	alias_method :on_interrupt_signal, :on_termination_signal
 
 
+	### Handle a HUP signal. The default is to restart the handler.
+	def on_hangup_signal( signo )
+		self.log.warn "Hangup (%p)" % [ signo ]
+		self.restart
+	end
+
+
 	### Handle a USR1 signal. Writes a message to the log by default.
 	def on_user1_signal( signo )
 		self.log.info "Checkpoint: User signal."

data/lib/mongrel2/request.rb

@@ -27,8 +27,8 @@ class Mongrel2::Request
 	### request object.
 	def self::parse( raw_request )
 		sender, conn_id, path, rest = raw_request.split( ' ', 4 )
-		self.log.debug "Parsing request for %p from %s:%s (rest: %p)" %
-			[ path, sender, conn_id, rest ]
+		self.log.debug "Parsing request for %p from %s:%s (rest: %p...)" %
+			[ path, sender, conn_id, rest[0,20] ]
 
 		# Extract the headers and the body, ignore the rest
 		headers, rest = TNetstring.parse( rest )

data/lib/mongrel2.rb

@@ -20,10 +20,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 1.9.2 or later. <<<\n\n" if RUBY_VERSION < '1.9.2'
 
 	# Library version constant
-	VERSION = '0.32.0'
+	VERSION = '0.33.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: ebfb060e8c65 $
+	REVISION = %q$Revision: 8703559eacf1 $
 
 
 	require 'mongrel2/constants'

data/spec/lib/helpers.rb

@@ -39,6 +39,8 @@ require 'mongrel2'
 require 'mongrel2/config'
 require 'mongrel2/testing'
 
+require 'loggability/spechelpers'
+
 require 'sequel'
 require 'sequel/model'
 
@@ -60,30 +62,6 @@ module Mongrel2::SpecHelpers
 	end
 
 
-	### Reset the logging subsystem to its default state.
-	def reset_logging
-		Loggability.formatter = nil
-		Loggability.output_to( $stderr )
-		Loggability.level = :fatal
-	end
-
-
-	### Alter the output of the default log formatter to be pretty in SpecMate output
-	def setup_logging( level=:fatal )
-
-		# Only do this when executing from a spec in TextMate
-		if ENV['HTML_LOGGING'] || (ENV['TM_FILENAME'] && ENV['TM_FILENAME'] =~ /_spec\.rb/)
-			logarray = []
-			Thread.current['logger-output'] = logarray
-			Loggability.output_to( logarray )
-			Loggability.format_as( :html )
-			Loggability.level = :debug
-		else
-			Loggability.level = level
-		end
-	end
-
-
 	### Set up a Mongrel2 configuration database in memory.
 	def setup_config_db
 		Mongrel2::Config.db ||= Mongrel2::Config.in_memory_db
@@ -254,6 +232,7 @@ RSpec.configure do |c|
 	c.include( Mongrel2::TestConstants )
 	c.include( Mongrel2::SpecHelpers )
 	c.include( Mongrel2::Matchers )
+	c.include( Loggability::SpecHelpers )
 
 	c.include( Mongrel2::Config::DSL )
 end

data/spec/mongrel2/handler_spec.rb

@@ -58,13 +58,15 @@ describe Mongrel2::Handler do
 
 	# Ensure 0MQ never actually gets called
 	before( :each ) do
-		@ctx = double( "0mq context" )
-		@request_sock = double( "request socket", :setsockopt => nil, :connect => nil, :close => nil )
-		@response_sock = double( "response socket", :setsockopt => nil, :connect => nil, :close => nil )
+		@ctx = double( '0mq context', close: nil )
+		@request_sock = double( "request socket", setsockopt: nil, connect: nil, close: nil )
+		@response_sock = double( "response socket", setsockopt: nil, connect: nil, close: nil )
 
 		@ctx.stub( :socket ).with( ZMQ::PULL ).and_return( @request_sock )
 		@ctx.stub( :socket ).with( ZMQ::PUB ).and_return( @response_sock )
 
+		ZMQ.stub( :select ).and_return([ [@request_sock], [], [] ])
+
 		Mongrel2.instance_variable_set( :@zmq_ctx, @ctx )
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.33.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri

metadata.gz.sig

@@ -1,3 +1,3 @@
-A8�@��2�W}�a0�TG�]�>���F��\��K���"�B��:�3�bEcs��^����
-��q:�={�~@�c��!w���[��5�t��qX���j
-�j��=֪���$�4��`�Jkh�o��Q-]`|��g��?lGW�_?0��i�s&K��h��#?�
+7�=�Սq��~5گ<����Hz/����P����{t�����
+�$
ÂF��s'>�w��
+��^�j�@*Y�'+�;<���^���v�+h��9fc2[*s��og3y���j�d@�Z����1��E?��W4�������'���ʬ"��*�O�