mongrel2 0.52.1 → 0.52.2

data/History.rdoc

@@ -1,3 +1,13 @@
+== v0.52.2 [2019-04-24] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Don't set linger on the Connection sockets until they're closing
+- Defer creation of the reactor in the handler until it's #run
+- Add #extended_reply? predicate to Mongrel2::Request for cases where
+  it's used as a response too
+
+
 == v0.52.1 [2018-07-23] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/lib/mongrel2.rb

@@ -22,10 +22,10 @@ module Mongrel2
 	abort "\n\n>>> Mongrel2 requires Ruby 2.2 or later. <<<\n\n" if RUBY_VERSION < '2.2.0'
 
 	# Library version constant
-	VERSION = '0.52.1'
+	VERSION = '0.52.2'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 476c62e8a8f0 $
+	REVISION = %q$Revision$
 
 
 	require 'mongrel2/constants'

data/lib/mongrel2/connection.rb

@@ -68,12 +68,10 @@ class Mongrel2::Connection
 	def connect
 		self.log.info "Connecting PULL request socket (%s)" % [ self.sub_addr ]
 		@request_sock = CZTop::Socket::PULL.new
-		@request_sock.options.linger = 0
 		@request_sock.connect( self.sub_addr )
 
 		self.log.info "Connecting PUB response socket (%s)" % [ self.pub_addr ]
 		@response_sock = CZTop::Socket::PUB.new
-		@response_sock.options.linger = 0
 		@response_sock.connect( self.pub_addr )
 	end
 
@@ -197,8 +195,14 @@ class Mongrel2::Connection
 	def close
 		return if self.closed?
 		self.closed = true
-		@request_sock.close if @request_sock
-		@response_sock.close if @response_sock
+		if @request_sock
+			@request_sock.options.linger = 0
+			@request_sock.close
+		end
+		if @response_sock
+			@response_sock.options.linger = 0
+			@response_sock.close
+		end
 	end
 
 

data/lib/mongrel2/handler.rb

@@ -141,10 +141,10 @@ class Mongrel2::Handler
 	def initialize( app_id, send_spec, recv_spec ) # :notnew:
 		super() # To the signal handler mixin
 
-		@app_id    = app_id
+		@app_id  = app_id
 
-		@conn      = Mongrel2::Connection.new( app_id, send_spec, recv_spec )
-		@reactor   = CZTop::Reactor.new
+		@conn    = Mongrel2::Connection.new( app_id, send_spec, recv_spec )
+		@reactor = nil
 	end
 
 
@@ -162,13 +162,14 @@ class Mongrel2::Handler
 
 	##
 	# The CZTop::Reactor that manages IO
-	attr_reader :reactor
+	attr_accessor :reactor
 
 
 	### Run the handler.
 	def run
 		self.log.info "Starting up %p" % [ self ]
 
+		self.reactor = CZTop::Reactor.new
 		self.reactor.register( @conn.request_sock, :read, &self.method(:on_socket_event) )
 		self.with_signal_handler( self.reactor, *QUEUE_SIGS ) do
 			self.start_accepting_requests
@@ -232,6 +233,8 @@ class Mongrel2::Handler
 	### Restart the handler. You should override this if you want to re-establish
 	### database connections, flush caches, or other restart-ey stuff.
 	def restart
+		raise "can't restart: not running" unless self.reactor
+
 		self.log.info "Restarting"
 		if (( old_conn = @conn ))
 			self.reactor.unregister( old_conn.request_sock )

data/lib/mongrel2/request.rb

@@ -248,6 +248,12 @@ class Mongrel2::Request
 	end
 
 
+	### Indicate that a request is never an extended reply.
+	def extended_reply?
+		return false
+	end
+
+
 	#
 	# :section: Introspection Methods
 	#

data/spec/mongrel2/config/directory_spec.rb

@@ -26,42 +26,49 @@ describe Mongrel2::Config::Directory, :db do
 		expect( @dir ).to be_valid()
 	end
 
+
 	it "isn't valid if it doesn't have a base" do
 		@dir.base = nil
 		expect( @dir ).to_not be_valid()
 		expect( @dir.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
+
 	it "isn't valid when its base starts with '/'" do
 		@dir.base = '/var/www/public/'
 		expect( @dir ).to_not be_valid()
 		expect( @dir.errors.full_messages.first ).to match( %r{shouldn't start with '/'}i )
 	end
 
+
 	it "isn't valid when its base doesn't end with '/'" do
 		@dir.base = 'var/www/public'
 		expect( @dir ).to_not be_valid()
 		expect( @dir.errors.full_messages.first ).to match( %r{must end with '/'}i )
 	end
 
+
 	it "isn't valid if it doesn't have an index file" do
 		@dir.index_file = nil
 		expect( @dir ).to_not be_valid()
 		expect( @dir.errors.full_messages.first ).to match( /must not be nil/i )
 	end
 
+
 	it "isn't valid if it doesn't have a default content-type" do
 		@dir.default_ctype = nil
 		expect( @dir ).to_not be_valid()
 		expect( @dir.errors.full_messages.first ).to match( /must not be nil/i )
 	end
 
+
 	it "isn't valid if its cache TTL is set to a negative value" do
 		@dir.cache_ttl = -5
 		expect( @dir ).to_not be_valid()
 		expect( @dir.errors.full_messages.first ).to match( /not a positive integer/i )
 	end
 
+
 	it "is valid if its cache TTL is set to zero" do
 		@dir.cache_ttl = 0
 		expect( @dir ).to be_valid()

data/spec/mongrel2/config/dsl_spec.rb

@@ -17,6 +17,7 @@ describe Mongrel2::Config::DSL, :db do
 
 
 	describe 'servers' do
+
 		it "can generate a default server config using the 'server' declarative" do
 			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5'
 
@@ -42,6 +43,7 @@ describe Mongrel2::Config::DSL, :db do
 			expect( result.error_log ).to eq( '/var/log/errors' )
 			expect( result.control_port ).to eq( '/var/run/intranet.sock' )
 		end
+
 	end
 
 	describe 'hosts' do
@@ -61,6 +63,7 @@ describe Mongrel2::Config::DSL, :db do
 			expect( host.name ).to eq( 'localhost' )
 		end
 
+
 		it "can add several elaborately-configured hosts to a server via a block" do
 			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5' do
 
@@ -138,9 +141,9 @@ describe Mongrel2::Config::DSL, :db do
 			expect( host2.routes.first ).to be_a( Mongrel2::Config::Route )
 		end
 
-
 	end
 
+
 	describe 'settings' do
 
 		before( :all ) do
@@ -151,6 +154,7 @@ describe Mongrel2::Config::DSL, :db do
 			Mongrel2::Config::Setting.dataset.exclude( :id => @ids ).delete
 		end
 
+
 		it "can set the expert tweakable settings en masse" do
 			result = settings(
 				"zeromq.threads"         => 8,
@@ -169,6 +173,7 @@ describe Mongrel2::Config::DSL, :db do
 			expect( result[2].value ).to eq( '0666' )
 		end
 
+
 		it "can set a single expert setting" do
 			result = setting "zeromq.threads", 16
 			expect( result ).to be_a( Mongrel2::Config::Setting )
@@ -195,6 +200,7 @@ describe Mongrel2::Config::DSL, :db do
 			expect( result[1].mimetype ).to eq( 'text/x-textile' )
 		end
 
+
 		it "can set a single mimetype mapping" do
 			result = mimetype '.tmpl', 'text/x-inversion-template'
 			expect( result ).to be_a( Mongrel2::Config::Mimetype )
@@ -204,6 +210,7 @@ describe Mongrel2::Config::DSL, :db do
 
 	end
 
+
 	describe 'filters' do
 
 		it "can add a filter to a server" do
@@ -216,6 +223,7 @@ describe Mongrel2::Config::DSL, :db do
 			expect( result.filters.first.settings ).to eq( {} )
 		end
 
+
 		it "can add a filter with settings to a server" do
 			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5' do
 				filter '/usr/lib/mongrel2/null.so',
@@ -231,6 +239,7 @@ describe Mongrel2::Config::DSL, :db do
 
 	end
 
+
 	describe 'xrequests' do
 
 		it "can add an xrequest to a server" do
@@ -243,6 +252,7 @@ describe Mongrel2::Config::DSL, :db do
 			expect( result.xrequests.first.settings ).to eq( {} )
 		end
 
+
 		it "can add a filter with settings to a server" do
 			result = server '965A7196-99BC-46FA-945B-3478AE92BFB5' do
 				xrequest '/usr/lib/mongrel2/null.so',

data/spec/mongrel2/config/handler_spec.rb

@@ -24,7 +24,6 @@ describe Mongrel2::Config::Handler, :db do
 	end
 
 
-
 	it "is valid if its specs and identities are all valid" do
 		expect( @handler ).to be_valid()
 	end
@@ -36,6 +35,7 @@ describe Mongrel2::Config::Handler, :db do
 		expect( @handler.errors.full_messages.first ).to match( /must not be nil/i )
 	end
 
+
 	it "isn't valid if it doesn't have a recv_spec" do
 		@handler.recv_spec = nil
 		expect( @handler ).to_not be_valid()
@@ -49,6 +49,7 @@ describe Mongrel2::Config::Handler, :db do
 		expect( @handler.errors.full_messages.first ).to match( /not a uri/i )
 	end
 
+
 	it "isn't valid if it doesn't have a valid URL in its recv_spec" do
 		@handler.recv_spec = 'smoke signals'
 		expect( @handler ).to_not be_valid()
@@ -62,6 +63,7 @@ describe Mongrel2::Config::Handler, :db do
 		expect( @handler.errors.full_messages.first ).to match( /invalid 0mq transport/i )
 	end
 
+
 	it "isn't valid if has an unsupported transport in its recv_spec" do
 		@handler.recv_spec = 'inproc://application'
 		expect( @handler ).to_not be_valid()
@@ -75,6 +77,7 @@ describe Mongrel2::Config::Handler, :db do
 		expect( @handler.errors.full_messages.first ).to match( /invalid sender identity/i )
 	end
 
+
 	it "*is* valid if it doesn't have a recv_ident" do
 		@handler.recv_ident = nil
 		expect( @handler ).to be_valid()
@@ -86,17 +89,20 @@ describe Mongrel2::Config::Handler, :db do
 		expect( @handler ).to be_valid()
 	end
 
+
 	it "is valid if it has 'tnetstring' set as the protocol" do
 		@handler.protocol = 'tnetstring'
 		expect( @handler ).to be_valid()
 	end
 
+
 	it "isn't valid if it has an invalid protocol" do
 		@handler.protocol = 'morsecode'
 		expect( @handler ).to_not be_valid()
 		expect( @handler.errors.full_messages.first ).to match( /invalid/i )
 	end
 
+
 	it "isn't valid if its send_spec isn't unique" do
 		dup = @handler.dup
 		@handler.save

data/spec/mongrel2/config/log_spec.rb

@@ -29,6 +29,7 @@ describe Mongrel2::Config::Log, :db do
 		expect( log.how ).to eq( how )
 	end
 
+
 	it "has reasonable defaults for 'where' and 'how'" do
 		what  = 'load etc/mongrel2.conf'
 		why   = 'updating'
@@ -39,6 +40,7 @@ describe Mongrel2::Config::Log, :db do
 		expect( log.how ).to eq( File.basename( $0 ) )
 	end
 
+
 	describe "an entry" do
 
 		before( :each ) do
@@ -66,6 +68,7 @@ describe Mongrel2::Config::Log, :db do
 			}x)
 		end
 
+
 		it "stringifies with a reason if it has one" do
 			@log.why = 'Because'
 

data/spec/mongrel2/config/route_spec.rb

@@ -30,6 +30,7 @@ describe Mongrel2::Config::Route, :db do
 		expect( @route.target ).to eq( dir )
 	end
 
+
 	it "returns a Mongrel2::Config::Proxy if its target_type is 'proxy'" do
 		proxy = Mongrel2::Config::Proxy.create( :addr => '10.2.18.8' )
 
@@ -39,6 +40,7 @@ describe Mongrel2::Config::Route, :db do
 		expect( @route.target ).to eq( proxy )
 	end
 
+
 	it "returns a Mongrel2::Config::Handler if its target_type is 'handler'" do
 		handler = Mongrel2::Config::Handler.create(
 			:send_ident => TEST_UUID,
@@ -51,6 +53,7 @@ describe Mongrel2::Config::Route, :db do
 		expect( @route.target ).to eq( handler )
 	end
 
+
 	it "raises an exception if its target_type is set to something invalid" do
 		@route.target_type = 'giraffes'
 

data/spec/mongrel2/config/server_spec.rb

@@ -30,30 +30,35 @@ describe Mongrel2::Config::Server, :db do
 		expect( @server ).to be_valid()
 	end
 
+
 	it "isn't valid if it doesn't have an access_log path" do
 		@server.access_log = nil
 		expect( @server ).to_not be_valid()
 		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
+
 	it "isn't valid if it doesn't have an error_log path" do
 		@server.error_log = nil
 		expect( @server ).to_not be_valid()
 		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
+
 	it "isn't valid if it doesn't have an pid_file path" do
 		@server.pid_file = nil
 		expect( @server ).to_not be_valid()
 		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
+
 	it "isn't valid if it doesn't have a default_host" do
 		@server.default_host = nil
 		expect( @server ).to_not be_valid()
 		expect( @server.errors.full_messages.first ).to match( /missing or nil/i )
 	end
 
+
 	it "isn't valid if it doesn't specify a port" do
 		@server.port = nil
 		expect( @server ).to_not be_valid()
@@ -68,6 +73,7 @@ describe Mongrel2::Config::Server, :db do
 		expect( @server.control_socket_uri ).to eq( '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
 		allow( FileTest ).to receive( :socket? ).with( '/usr/local/www/var/run/control.sock' ).
@@ -76,12 +82,14 @@ describe Mongrel2::Config::Server, :db do
 		expect( @server.control_socket_uri ).to eq( '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
 		allow( FileTest ).to receive( :socket? ).with( '/usr/local/www/run/control' ).
@@ -91,12 +99,14 @@ describe Mongrel2::Config::Server, :db do
 		sock.close
 	end
 
+
 	it "knows what the Pathname of its PID file is" do
 		pidfile = @server.pid_file_path
 		expect( pidfile ).to be_a( Pathname )
 		expect( pidfile.to_s ).to eq( '/run/mongrel2.pid' )
 	end
 
+
 	it "has a predicate that understands the use_ssl value" do
 		expect( @server.use_ssl ).to be_falsey()
 		@server.use_ssl = true

data/spec/mongrel2/config_spec.rb

@@ -38,12 +38,14 @@ describe Mongrel2::Config do
 		end
 	end
 
+
 	it "can reset the database handle for the config classes" do
 		db = Mongrel2::Config.in_memory_db
 		Mongrel2::Config.db = db
 		expect( Mongrel2::Config::Directory.db ).to equal( db )
 	end
 
+
 	it "has a convenience method for fetching an Array of all of its configured servers" do
 		Mongrel2::Config.init_database
 		Mongrel2::Config::Server.truncate
@@ -60,6 +62,7 @@ describe Mongrel2::Config do
 		expect( Mongrel2::Config.servers.first.uuid ).to eq( TEST_UUID )
 	end
 
+
 	it "has a convenience method for getting a setting's value" do
 		Mongrel2::Config.init_database
 		Mongrel2::Config::Setting.dataset.truncate
@@ -69,10 +72,12 @@ describe Mongrel2::Config do
 		expect( Mongrel2::Config.settings[ :control_port ] ).to eq( 'ipc://var/run/control.sock' )
 	end
 
+
 	it "can read the configuration schema from a data file" do
 		expect( Mongrel2::Config.load_config_schema ).to match( /create table server/i )
 	end
 
+
 	it "knows whether or not its database has been initialized" do
 		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
 		expect( Mongrel2::Config.database_initialized? ).to be_falsey()
@@ -80,6 +85,7 @@ describe Mongrel2::Config do
 		expect( Mongrel2::Config.database_initialized? ).to be_truthy()
 	end
 
+
 	it "doesn't re-initialize the database if the non-bang version of init_database is used" do
 		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
 		Mongrel2::Config.init_database
@@ -88,22 +94,26 @@ describe Mongrel2::Config do
 		Mongrel2::Config.init_database
 	end
 
+
 	it "can return the path to the config DB as a Pathname if it's pointing at a file" do
 		Mongrel2::Config.db = Sequel.
 			connect( adapter: Mongrel2::Config.sqlite_adapter, database: 'config-spec.sqlite' )
 		expect( Mongrel2::Config.dbname ).to eq( 'config-spec.sqlite' )
 	end
 
+
 	it "returns nil if asked for the pathname to an in-memory database" do
 		Mongrel2::Config.db = Mongrel2::Config.in_memory_db
 		expect( Mongrel2::Config.dbname ).to be_nil()
 	end
 
+
 	describe "Configurability support", :if => defined?( Configurability ) do
 		require 'configurability/behavior'
 
 		it_should_behave_like "an object with Configurability"
 
+
 		it "uses the 'mongrel2' config section" do
 			expect( Mongrel2::Config.config_key ).to eq( :mongrel2 )
 		end