mongrel2 0.21.0 → 0.22.1

data/ChangeLog

@@ -1,8 +1,62 @@
+2012-05-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.22.0 for changeset 82e0a3ed6dc5
+	[666e8d88a6d7] [tip]
+
+	* .hgsigs:
+	Added signature for changeset e25ffaab1897
+	[82e0a3ed6dc5] [v0.22.0]
+
+	* History.rdoc, Manifest.txt, lib/mongrel2.rb:
+	Bump the minor version, update history and manifest.
+	[e25ffaab1897]
+
+	* .rvm.gems, Rakefile, bin/m2sh.rb, examples/helloworld-handler.rb,
+	examples/request-dumper.rb, examples/ws-echo.rb,
+	experiments/endtoend.rb, experiments/xmlhandler.rb, lib/mongrel2.rb,
+	lib/mongrel2/config.rb, lib/mongrel2/config/dsl.rb,
+	lib/mongrel2/config/host.rb, lib/mongrel2/config/server.rb,
+	lib/mongrel2/connection.rb, lib/mongrel2/control.rb,
+	lib/mongrel2/handler.rb, lib/mongrel2/httprequest.rb,
+	lib/mongrel2/httpresponse.rb, lib/mongrel2/jsonrequest.rb,
+	lib/mongrel2/logging.rb, lib/mongrel2/mixins.rb,
+	lib/mongrel2/request.rb, lib/mongrel2/response.rb,
+	lib/mongrel2/table.rb, lib/mongrel2/testing.rb,
+	lib/mongrel2/websocket.rb, lib/mongrel2/xmlrequest.rb,
+	spec/lib/helpers.rb, spec/mongrel2/handler_spec.rb,
+	spec/mongrel2/logging_spec.rb, spec/mongrel2/mixins_spec.rb,
+	spec/mongrel2_spec.rb:
+	Convert to Loggability for logging.
+	[0da53476f796]
+
+2012-04-25  Michael Granger  <ged@FaerieMUD.org>
+
+	* bin/m2sh.rb:
+	Add an option to m2sh.rb to set the m2 port on the fly
+	[0a0238b4c238] [github/master]
+
 2012-04-23  Michael Granger  <ged@FaerieMUD.org>
 
+	* .hgtags:
+	Added tag v0.21.0 for changeset 84fe60846300
+	[bb658253dfe9]
+
+	* .hgsigs:
+	Added signature for changeset d7c540c7a114
+	[84fe60846300] [v0.21.0]
+
+	* .rvm.gems:
+	Bumped hoe-deveiate in the dev gemset
+	[d7c540c7a114]
+
+	* History.rdoc, lib/mongrel2.rb:
+	Bump the minor version, update history.
+	[0ecd9e4d21ee]
+
 	* Rakefile:
 	Activate deveiate Hoe plugin
-	[4b74d9363949] [github/master, tip]
+	[4b74d9363949]
 
 	* lib/mongrel2/handler.rb:
 	Log the request at INFO, too.

data/History.rdoc

@@ -1,3 +1,15 @@
+== v0.22.1 [2012-05-07] Michael Granger <ged@FaerieMUD.org>
+
+Fix loggability dependency version.
+
+
+== v0.22.0 [2012-05-07] Michael Granger <ged@FaerieMUD.org>
+
+- Convert to Loggability for logging.
+- Add an option to bin/m2sh.rb to rewrite the mongrel2 port of a host
+  on the fly at startup.
+
+
 == v0.21.0 [2012-04-23] Michael Granger <ged@FaerieMUD.org>
 
 - Rename the defaults for Mongrel2::Config.

data/Manifest.txt

@@ -42,8 +42,6 @@ lib/mongrel2/handler.rb
 lib/mongrel2/httprequest.rb
 lib/mongrel2/httpresponse.rb
 lib/mongrel2/jsonrequest.rb
-lib/mongrel2/logging.rb
-lib/mongrel2/mixins.rb
 lib/mongrel2/request.rb
 lib/mongrel2/response.rb
 lib/mongrel2/table.rb
@@ -71,8 +69,6 @@ spec/mongrel2/control_spec.rb
 spec/mongrel2/handler_spec.rb
 spec/mongrel2/httprequest_spec.rb
 spec/mongrel2/httpresponse_spec.rb
-spec/mongrel2/logging_spec.rb
-spec/mongrel2/mixins_spec.rb
 spec/mongrel2/request_spec.rb
 spec/mongrel2/response_spec.rb
 spec/mongrel2/table_spec.rb

data/Rakefile

@@ -33,7 +33,8 @@ hoespec = Hoe.spec 'mongrel2' do
 	self.dependency 'yajl-ruby',  '~> 1.0'
 	self.dependency 'trollop',    '~> 1.16'
 	self.dependency 'sysexits',   '~> 1.0'
-	self.dependency 'zmq',        '~> 2.1.4'
+	self.dependency 'zmq',        '~> 2.1'
+	self.dependency 'loggability','~> 0.0'
 
 	self.dependency 'configurability', '~> 1.0', :developer
 	self.dependency 'simplecov',       '~> 0.6', :developer

data/bin/m2sh.rb

@@ -5,6 +5,7 @@ require 'pathname'
 require 'shellwords'
 require 'fileutils'
 require 'tnetstring'
+require 'loggability'
 
 require 'trollop'
 require 'highline'
@@ -45,11 +46,15 @@ require 'mongrel2/config'
 # mongrel2.
 #
 class Mongrel2::M2SHCommand
-	extend ::Sysexits
+	extend ::Sysexits,
+	       Loggability
 	include Sysexits,
-	        Mongrel2::Loggable,
 	        Mongrel2::Constants
 
+	# Loggability API -- set up logging under the 'strelka' log host
+	log_to :mongrel2
+
+
 	# Make a HighLine color scheme
 	COLOR_SCHEME = HighLine::ColorScheme.new do |scheme|
 		scheme[:header]    = [ :bold, :yellow ]
@@ -125,8 +130,8 @@ class Mongrel2::M2SHCommand
 		exit :ok
 
 	rescue => err
-		Mongrel2.logger.fatal "Oops: %s: %s" % [ err.class.name, err.message ]
-		Mongrel2.logger.debug { '  ' + err.backtrace.join("\n  ") }
+		self.fatal "Oops: %s: %s" % [ err.class.name, err.message ]
+		self.debug { '  ' + err.backtrace.join("\n  ") }
 
 		exit :software_error
 	end
@@ -167,7 +172,7 @@ class Mongrel2::M2SHCommand
 			default_configdb = Mongrel2::DEFAULT_CONFIG_URI
 
 			# Make a list of the log level names and the available commands
-			loglevels = Mongrel2::Logging::LOG_LEVELS.
+			loglevels = Loggability::LOG_LEVELS.
 				sort_by {|name,lvl| lvl }.
 				collect {|name,lvl| name.to_s }.
 				join( ', ' )
@@ -184,12 +189,14 @@ class Mongrel2::M2SHCommand
 				opt :config, "Specify the configfile to use.",
 					:default => DEFAULT_CONFIG_URI
 				opt :sudo, "Use 'sudo' to run the mongrel2 server."
+				opt :port, "Reset the server port to <i> before starting it.",
+					:type => :integer
 				text ''
 
 				text 'Other Options:'
 				opt :debug, "Turn debugging on. Also sets the --loglevel to 'debug'."
 				opt :loglevel, "Set the logging level. Must be one of: #{loglevels}",
-					:default => Mongrel2::Logging::LOG_LEVEL_NAMES[ Mongrel2.logger.level ]
+					:default => Mongrel2.logger.level.to_s
 			end
 		end
 
@@ -204,16 +211,16 @@ class Mongrel2::M2SHCommand
 	### Create a new instance of the command and set it up with the given
 	### +options+.
 	def initialize( options )
-		Mongrel2.logger.formatter = Mongrel2::Logging::ColorFormatter.new( Mongrel2.logger )
+		Loggability.format_as( :color ) if $stderr.tty?
 		@options = options
 		@shellmode = false
 
 		if @options.debug
 			$DEBUG = true
 			$VERBOSE = true
-			Mongrel2.logger.level = Logger::DEBUG
+			Loggability.level = Logger::DEBUG
 		elsif @options.loglevel
-			Mongrel2.logger.level = Mongrel2::Logging::LOG_LEVELS[ @options.loglevel ]
+			Loggability.level = @options.loglevel
 		end
 
 		Mongrel2::Config.configure( :configdb => @options.config )
@@ -498,6 +505,12 @@ class Mongrel2::M2SHCommand
 		server = find_server( args.shift )
 		mongrel2 = ENV['MONGREL2'] || 'mongrel2'
 
+		if options.port
+			message "Resetting %s server's port to %d" % [ server.name, options.port ]
+			server.port = options.port
+			server.save
+		end
+
 		# Run the command, waiting for it to finish if invoked from shell mode, or
 		# execing it if not.
 		cmd = [ mongrel2, Mongrel2::Config.dbname.to_s, server.uuid ]

data/examples/helloworld-handler.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'logger'
+require 'loggability'
 require 'mongrel2/config'
 require 'mongrel2/handler'
 
@@ -23,8 +23,8 @@ end # class HelloWorldHandler
 configdb = ARGV.shift || 'examples.sqlite'
 
 # Log to a file instead of STDERR for a bit more speed.
-# Mongrel2.log = Logger.new( 'hello-world.log' )
-Mongrel2.log.level = Logger::DEBUG
+# Loggability.output_to( 'hello-world.log' )
+Loggability.level = :debug
 
 # Point to the config database, which will cause the handler to use
 # its ID to look up its own socket info.

data/examples/request-dumper.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'pathname'
-require 'logger'
+require 'loggability'
 require 'mongrel2/config'
 require 'mongrel2/handler'
 
@@ -38,8 +38,8 @@ class RequestDumper < Mongrel2::Handler
 
 end # class RequestDumper
 
-Mongrel2.log.level = Logger::DEBUG
-Inversion.log.level = Logger::INFO
+Loggability.level = :debug
+Loggability[ Inversion ].level = :info
 
 # Point to the config database, which will cause the handler to use
 # its ID to look up its own socket info.

data/examples/ws-echo.rb

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+require 'loggability'
 require 'pathname'
-require 'logger'
 require 'mongrel2/config'
 require 'mongrel2/logging'
 require 'mongrel2/handler'
@@ -241,8 +241,8 @@ class WebSocketEchoServer < Mongrel2::Handler
 
 end # class RequestDumper
 
-Mongrel2.log.level = $DEBUG||$VERBOSE ? Logger::DEBUG : Logger::INFO
-Mongrel2.log.formatter = Mongrel2::Logging::ColorFormatter.new( Mongrel2.log ) if $stdin.tty?
+Loggability.level = $DEBUG||$VERBOSE ? :debug : :info
+Loggability.format_as( :color ) if $stdin.tty?
 
 # Point to the config database, which will cause the handler to use
 # its ID to look up its own socket info.

data/lib/mongrel2.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'loggability'
 require 'zmq'
 
 #
@@ -10,18 +11,20 @@ require 'zmq'
 # * Michael Granger <ged@FaerieMUD.org>
 #
 module Mongrel2
+	extend Loggability
+
+	# Loggability API -- set up Mongrel2 as a log host
+	log_as :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.21.0'
+	VERSION = '0.22.1'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 0ecd9e4d21ee $
-
+	REVISION = %q$Revision: c68ca662121f $
 
-	require 'mongrel2/logging'
-	extend Mongrel2::Logging
 
 	require 'mongrel2/constants'
 	include Mongrel2::Constants
@@ -42,7 +45,7 @@ module Mongrel2
 	### Fetch the ZMQ::Context for sockets, creating it if necessary.
 	def self::zmq_context
 		if @zmq_ctx.nil?
-			Mongrel2.log.info "Using 0MQ %d.%d.%d" % ZMQ.version
+			self.log.info "Using 0MQ %d.%d.%d" % ZMQ.version
 			@zmq_ctx = ZMQ::Context.new
 		end
 

data/lib/mongrel2/config.rb

@@ -5,6 +5,7 @@ require 'yaml'
 require 'pathname'
 require 'uri'
 require 'tnetstring'
+require 'loggability'
 
 require 'sequel'
 
@@ -26,26 +27,29 @@ end
 
 
 require 'mongrel2' unless defined?( Mongrel2 )
-require 'mongrel2/mixins'
 
 module Mongrel2
 
 	# The base Mongrel2 database-backed configuration class. It's a subclass of Sequel::Model, so
-	# you'll first need to be familiar with Sequel (http://sequel.rubyforge.org/) and 
-	# especially its Sequel::Model ORM. 
+	# you'll first need to be familiar with Sequel (http://sequel.rubyforge.org/) and
+	# especially its Sequel::Model ORM.
 	#
-	# You will also probably want to refer to the Sequel::Plugins documentation for the 
+	# You will also probably want to refer to the Sequel::Plugins documentation for the
 	# validation_helpers[http://sequel.rubyforge.org/rdoc-plugins/classes/Sequel/Plugins/ValidationHelpers.html]
-	# and 
+	# and
 	# subclasses[http://sequel.rubyforge.org/rdoc-plugins/classes/Sequel/Plugins/Subclasses.html]
 	# plugins.
-	# 
+	#
 	# == References
 	# * http://mongrel2.org/static/mongrel2-manual.html#x1-250003.4
 	#
 	class Config < Sequel::Model
-		include Mongrel2::Loggable
+		extend Loggability
+
+		# Loggability API -- set up logging under the 'mongrel2' log host
+		log_to :mongrel2
 
+		# Sequel API -- load some plugins
 		plugin :validation_helpers
 		plugin :subclasses
 		plugin :json_serializer
@@ -129,9 +133,9 @@ module Mongrel2
 			end
 
 			if self == Mongrel2::Config
-				Mongrel2.log.debug "Resetting database connection for %d config classes to: %p" %
+				self.log.debug "Resetting database connection for %d config classes to: %p" %
 					[ self.descendents.length, newdb ]
-				newdb.logger = Mongrel2.logger
+				newdb.logger = Loggability[ Mongrel2 ].proxy_for( newdb )
 				newdb.sql_log_level = :debug
 
 				self.descendents.each {|subclass| subclass.db = newdb }
@@ -191,7 +195,7 @@ module Mongrel2
 			sql = self.load_config_schema
 			mimetypes_sql = self.load_mimetypes_sql
 
-			Mongrel2.log.warn "Installing config schema."
+			self.log.warn "Installing config schema."
 
 			self.db.execute_ddl( sql )
 			self.db.run( mimetypes_sql )

data/lib/mongrel2/config/dsl.rb

@@ -1,17 +1,22 @@
 #!/usr/bin/env ruby
 
+require 'loggability'
+
 require 'mongrel2' unless defined?( Mongrel2 )
 require 'mongrel2/config' unless defined?( Mongrel2::Config )
 
 # See DSL.rdoc for details on how to use this mixin.
 module Mongrel2::Config::DSL
 
-
 	# A decorator object that provides the DSL-ish interface to the various Config
 	# objects. It derives its interface on the fly from columns of the class it's
 	# created with and a DSLMethods mixin if the target class defines one.
 	class Adapter
-		include Mongrel2::Loggable
+		extend Loggability
+
+		# Loggability API -- set up logging under the 'mongrel2' log host
+		log_to :mongrel2
+
 
 		### Create an instance of the specified +targetclass+ using the specified +opts+
 		### as initial values. The first pair of +opts+ will be used in the filter to

data/lib/mongrel2/config/host.rb

@@ -30,7 +30,7 @@ class Mongrel2::Config::Host < Mongrel2::Config( :host )
 		### Add a Mongrel2::Config::Route to the Host object.
 		def route( path, target, opts={} )
 			self.target.save
-			Mongrel2.log.debug "Route %s -> %p [%p]" % [ path, target, opts ]
+			self.log.debug "Route %s -> %p [%p]" % [ path, target, opts ]
 
 			args = { :path => path, :target => target }
 			args.merge!( opts )
@@ -87,11 +87,11 @@ class Mongrel2::Config::Host < Mongrel2::Config( :host )
 
 			existing = Mongrel2::Config::Handler.filter( :send_ident => send_ident )
 			unless existing.select( :id ).empty?
-				Mongrel2.log.debug "Dropping existing %p handler." % [ send_ident ]
+				self.log.debug "Dropping existing %p handler." % [ send_ident ]
 				existing.delete
 			end
 
-			Mongrel2.log.debug "Creating handler with options: %p" % [ options ]
+			self.log.debug "Creating handler with options: %p" % [ options ]
 			return Mongrel2::Config::Handler.create( options )
 		end
 

data/lib/mongrel2/config/server.rb

@@ -41,16 +41,16 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 	def control_socket_uri
 		# Find the control socket relative to the server's chroot
 		csock_uri = Mongrel2::Config.settings[:control_port] || DEFAULT_CONTROL_SOCKET
-		Mongrel2.log.debug "Chrooted control socket uri is: %p" % [ csock_uri ]
+		self.log.debug "Chrooted control socket uri is: %p" % [ csock_uri ]
 
 		scheme, sock_path = csock_uri.split( '://', 2 )
-		Mongrel2.log.debug "  chrooted socket path is: %p" % [ sock_path ]
+		self.log.debug "  chrooted socket path is: %p" % [ sock_path ]
 
 		csock_path = Pathname( self.chroot ) + sock_path
-		Mongrel2.log.debug "  fully-qualified path is: %p" % [ csock_path ]
+		self.log.debug "  fully-qualified path is: %p" % [ csock_path ]
 		csock_uri = "%s://%s" % [ scheme, csock_path ]
 
-		Mongrel2.log.debug "  control socket URI is: %p" % [ csock_uri ]
+		self.log.debug "  control socket URI is: %p" % [ csock_uri ]
 		return csock_uri
 	end
 
@@ -91,7 +91,7 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 		def host( name, &block )
 			self.target.save( :validate => false )
 
-			Mongrel2.log.debug "Host [%s] (block: %p)" % [ name, block ]
+			self.log.debug "Host [%s] (block: %p)" % [ name, block ]
 			adapter = Mongrel2::Config::DSL::Adapter.new( Mongrel2::Config::Host, name: name )
 			adapter.target.matching = name
 			adapter.instance_eval( &block ) if block
@@ -104,7 +104,7 @@ class Mongrel2::Config::Server < Mongrel2::Config( :server )
 		def filter( path, settings={} )
 			self.target.save( :validate => false )
 
-			Mongrel2.log.debug "Filter [%s]: %p" % [ path, settings ]
+			self.log.debug "Filter [%s]: %p" % [ path, settings ]
 			self.target.add_filter( name: path, settings: settings )
 		end