mongrel2 0.30.1 → 0.31.0

data/ChangeLog

@@ -1,8 +1,137 @@
+2012-07-27  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.30.1 for changeset 01750f74082c
+	[8208fbbc6641] [tip]
+
+	* .hgsigs:
+	Added signature for changeset 4ebef57dc78c
+	[01750f74082c] [v0.30.1]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the patch version, update history.
+	[4ebef57dc78c]
+
+	* Rakefile:
+	Depend on sqlite3 instead of amalgalite until
+	(https://github.com/copiousfreetime/amalgalite/pull/22) is fixed.
+	[9244ea0f0a1c]
+
+	* README.rdoc:
+	Fixing URLs
+	[6d4a90ec1980]
+
+	* .hgtags:
+	Added tag v0.30.0 for changeset 2a049832e502
+	[3ba5c68433bf]
+
+	* .hgsigs:
+	Added signature for changeset 560f4524ebb0
+	[2a049832e502] [v0.30.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump minor version, update history.
+	[560f4524ebb0]
+
+	* Manifest.txt, Rakefile, bin/m2sh.rb, data/mongrel2/index.html.in:
+	Add some quickstart niceties.
+
+	- Add a static index page to the quickstart Dir directory.
+	- Make the failure to find a mongrel2 binary friendlier.
+	[b1d49912af4d]
+
+2012-07-18  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/mongrel2/config/handler.rb:
+	Fix parameter name of ::by_send_ident for auto-mapping by the rest
+	service.
+	[b24be0f1aa72]
+
+2012-07-13  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.29.0 for changeset b8cf89311fb4
+	[667c5c23df4e]
+
+	* .hgsigs:
+	Added signature for changeset cc6fcfdf3335
+	[b8cf89311fb4] [v0.29.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[cc6fcfdf3335]
+
+	* bin/m2sh.rb, lib/mongrel2/config.rb, lib/mongrel2/config/log.rb,
+	lib/mongrel2/config/server.rb, spec/mongrel2/config/log_spec.rb:
+	Finish work on the event log.
+	- Make m2sh.rb write events for modifying actions
+	- Add a --why option to m2sh.rb to allow reasons for actions to be
+	logged.
+	- Add a convenience delegator to Mongrel2::Config for logging an
+	action.
+	- Finish Mongrel2::Config::Log method documentation
+	- Remove RDoc sections from Mongrel2::Config::Server, as they made
+	stuff more difficult to find.
+	- Add Mongrel2::Config::Server#to_s
+	- Make stringified Log events only include parens if the event has a
+	'why' field.
+	[be803763277b]
+
+2012-07-12  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/m2sh.rb:
+	Remove extraneous message from m2sh.rb's quickstart subcommand
+	[f61d11f41fd5]
+
+	* .hgtags:
+	Added tag v0.28.0 for changeset 87ce465f7115
+	[fbe30eb8facb]
+
+	* .hgsigs:
+	Added signature for changeset 511f5e29f0a0
+	[87ce465f7115] [v0.28.0]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[511f5e29f0a0]
+
+	* lib/mongrel2/config/server.rb, spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/server_spec.rb:
+	Make Config::Server path methods variants instead of overrides.
+	[348e208d3fc8]
+
+	* lib/mongrel2/config/server.rb, spec/mongrel2/config/dsl_spec.rb,
+	spec/mongrel2/config/server_spec.rb:
+	Return Pathname objects from Mongrel2::Config::Server's path
+	attributes.
+	[eacf9ac21a43]
+
+2012-07-11  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/m2sh.rb:
+	Show the server's URL at startup
+	[2d666bba472c]
+
+	* lib/mongrel2/config/server.rb:
+	Finish Config::Server API docs and add a predicate method for
+	use_ssl
+	[fc283cc7a9f5]
+
+2012-07-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/m2sh.rb:
+	Remove shell mode from m2sh.rb.
+	[d6c7fbd1142c]
+
+	* Manifest.txt:
+	Don't distribute my Foreman env for the examples
+	[c54940c0c1c8]
+
 2012-07-02  Michael Granger  <ged@FaerieMUD.org>
 
 	* .hgtags:
 	Added tag v0.27.0 for changeset 8883019d3299
-	[b85c576e5fb1] [tip]
+	[b85c576e5fb1]
 
 	* .hgsigs:
 	Added signature for changeset 6de3cbe2409c

data/History.rdoc

@@ -1,3 +1,13 @@
+== v0.31.0 [2012-07-30] Michael Granger <ged@FaerieMUD.org>
+
+Improve Server control-socket pathing.
+
+Mongrel2::Config::Server#control_socket will now check for it
+under the chroot, and relative to the pwd, and will raise an
+exception if no socket is found instead of just returning a
+socket that's doomed to block forever.
+
+
 == v0.30.1 [2012-07-27] Michael Granger <ged@FaerieMUD.org>
 
 Documentation and packaging fixes. Switch to sqlite3 until

data/bin/m2sh.rb

@@ -49,7 +49,7 @@ class Mongrel2::M2SHCommand
 	extend ::Sysexits,
 	       Loggability
 	include Sysexits,
-			Mongrel2::Constants
+	        Mongrel2::Constants
 
 	# Loggability API -- set up logging under the 'strelka' log host
 	log_to :mongrel2
@@ -448,6 +448,14 @@ class Mongrel2::M2SHCommand
 			server.port,
 		]
 
+		# Change into the server's chroot directory so paths line up whether or not
+		# it's started as root
+		Dir.chdir( server.chroot ) do
+			Mongrel2::Config.log_action( "Starting server: #{server}", self.options.why )
+			header "Starting mongrel2 at: #{url}"
+			exec( *cmd )
+		end
+
 		Mongrel2::Config.log_action( "Starting server: #{server}", self.options.why )
 		message '*' * 70
 		header "Starting mongrel2 at: #{url}"

data/examples/Procfile

@@ -3,4 +3,4 @@ mongrel2: ruby ../bin/m2sh.rb -c examples.sqlite start
 helloworld: ruby helloworld-handler.rb
 async_upload: ruby async-upload.rb
 request_dumper: ruby request-dumper.rb
-ws: ruby -w ws-echo.rb
+ws: ruby ws-echo.rb

data/examples/config.rb

@@ -20,7 +20,7 @@ server 'examples' do
 
 	access_log   '/logs/access.log'
 	error_log    '/logs/error.log'
-	chroot       '/var/mongrel2'
+	chroot       basedir
 	pid_file     '/var/run/mongrel2.pid'
 
 	bind_addr    '0.0.0.0'
@@ -51,6 +51,7 @@ setting 'control_port', 'ipc://var/run/control'
 setting 'upload.temp_store', upload_dir + 'mongrel2.upload.XXXXXX'
 
 mkdir_p 'var/run'
+mkdir_p 'var/mongrel2'
 mkdir_p 'logs'
 mkdir_p '/tmp/mongrel2-uploads'
 

data/lib/mongrel2/config/server.rb

@@ -141,7 +141,14 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 		self.log.debug "  chrooted socket path is: %p" % [ sock_path ]
 
 		csock_path = self.chroot_path + sock_path
-		self.log.debug "  fully-qualified path is: %p" % [ csock_path ]
+		if csock_path.socket?
+			self.log.debug "  socket path is relative to the chroot: %p" % [ csock_path ]
+		else
+			csock_path = Pathname.pwd + sock_path
+			raise "Unable to find the socket path %p" % [ csock_uri ] unless csock_path.socket?
+			self.log.debug "  socket path is relative to the PWD: %p" % [ csock_path ]
+		end
+
 		csock_uri = "%s://%s" % [ scheme, csock_path ]
 
 		self.log.debug "  control socket URI is: %p" % [ csock_uri ]

data/lib/mongrel2/control.rb

@@ -2,6 +2,7 @@
 
 require 'zmq'
 require 'yajl'
+require 'pathname'
 require 'tnetstring'
 require 'loggability'
 
@@ -25,6 +26,7 @@ class Mongrel2::Control
 
 	### Create a new control port object using the current configuration.
 	def initialize( port=DEFAULT_PORT )
+		check_port( port )
 		@ctx = Mongrel2.zmq_context
 		@socket = @ctx.socket( ZMQ::REQ )
 		@socket.setsockopt( ZMQ::LINGER, 0 )
@@ -207,6 +209,18 @@ class Mongrel2::Control
 		end
 	end
 
+
+	### Check the path of the specified port if it's an 'ipc' URL, ensuring that a pipe exists
+	### there, and raising an exception if none does.
+	def check_port( port )
+		scheme, path = port.split( '://' )
+		return unless scheme == 'ipc'
+
+		raise "%s: not a socket" % [ path ] unless FileTest.socket?( path )
+
+		return true
+	end
+
 end # class Mongrel2::Control
 
 # vim: set nosta noet ts=4 sw=4:

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.30.1'
+	VERSION = '0.31.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 4ebef57dc78c $
+	REVISION = %q$Revision: 11f88c736464 $
 
 
 	require 'mongrel2/constants'

data/spec/mongrel2/config/server_spec.rb

@@ -83,17 +83,29 @@ describe Mongrel2::Config::Server do
 
 	it "knows where its control socket is if there's no setting for control_port" do
 		Mongrel2::Config::Setting.dataset.truncate
+		FileTest.stub( :socket? ).with( '/usr/local/www/run/control' ).
+			and_return( true )
 		@server.control_socket_uri.should == 'ipc:///usr/local/www/run/control'
 	end
 
 	it "knows where its control socket is if there is a setting for control_port" do
 		Mongrel2::Config::Setting.dataset.truncate
+		FileTest.stub( :socket? ).with( '/usr/local/www/var/run/control.sock' ).
+			and_return( true )
 		Mongrel2::Config::Setting.create( key: 'control_port', value: 'ipc://var/run/control.sock' )
 		@server.control_socket_uri.should == 'ipc:///usr/local/www/var/run/control.sock'
 	end
 
+	it "raises an error if the control socket path doesn't point to a UNIX socket" do
+		expect {
+			@server.control_socket
+		}.to raise_error( RuntimeError, /unable to find the socket/i )
+	end
+
 	it "can create a Mongrel2::Control for its control port" do
 		Mongrel2::Config::Setting.dataset.truncate
+		FileTest.stub( :socket? ).with( '/usr/local/www/run/control' ).
+			and_return( true )
 		sock = @server.control_socket
 		sock.should be_a( Mongrel2::Control )
 		sock.close

data/spec/mongrel2/control_spec.rb

@@ -35,7 +35,9 @@ describe Mongrel2::Control do
 
 		Mongrel2.instance_variable_set( :@zmq_ctx, @ctx )
 
-		@control = Mongrel2::Control.new
+		FileTest.stub( :socket? ).with( 'var/run/control' ). and_return( true )
+
+		@control = Mongrel2::Control.new( 'ipc://var/run/control' )
 	end
 
 	after( :all ) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongrel2
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.31.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
   Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
   cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri