unicorn-cuba-base 1.1.2 → 1.2.0

data/Gemfile

@@ -15,4 +15,5 @@ group :development do
   gem "rspec", "~> 2.13"
   gem "rdoc", "~> 3.9"
   gem "jeweler", "~> 1.8.4"
+  gem "capture-output", "~> 1.0"
 end

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    capture-output (1.0.0)
     cli (1.3.1)
     cuba (3.1.0)
       rack
@@ -37,6 +38,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  capture-output (~> 1.0)
   cli (~> 1.3)
   cuba (~> 3.0)
   facter (~> 1.6.11)

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/unicorn-cuba-base/default_error_reporter.rb

@@ -1,4 +1,6 @@
-class DefaultErrorReporter < Controler
+require 'pp'
+
+class DefaultErrorReporter < Controller
 	self.define do
 		on error Rack::UnhandledRequest::UnhandledRequestError do |error|
 			write_error 404, error
@@ -9,6 +11,10 @@ class DefaultErrorReporter < Controler
 			raise error
 		end
 
+		on error URI::InvalidURIError do |error|
+			write_error 400, error
+		end
+
 		on error StandardError do |error|
 			log.error "unhandled error while processing request: #{env['REQUEST_METHOD']} #{env['SCRIPT_NAME']}[#{env["PATH_INFO"]}]", error
 			log.debug {

data/lib/unicorn-cuba-base/rack/common_logger_xid.rb

@@ -0,0 +1,15 @@
+module Rack
+	class CommonLoggerXID < Rack::CommonLogger
+		def log(env, *args)
+			# this is called after body was sent so it won't be in scope of XIDLogging - setting xid again
+			xid = env['xid'] && env['xid'].first.last
+			if xid
+				@logger.with_meta_context(xid: xid) do
+					super(env, *args)
+				end
+			else
+				super(env, *args)
+			end
+		end
+	end
+end

data/lib/unicorn-cuba-base/rack/error_handling.rb

@@ -1,5 +1,3 @@
-require 'pp'
-
 module Rack
 	class ErrorHandling
 		def initialize(app, &block)
@@ -22,7 +20,7 @@ module Rack
 
 					return @app.call(env)
 				rescue
-					raise 
+					raise
 				end
 			end
 		end

data/lib/unicorn-cuba-base/rack/xid_logging.rb

@@ -0,0 +1,24 @@
+module Rack
+	class XIDLogging
+		def initialize(app, root_logger, header_name = 'XID', &block)
+			@root_logger = root_logger
+			@header_name = header_name
+			@app = app
+		end
+
+		def call(env)
+			begin
+				xid = env["HTTP_#{@header_name.upcase.tr('-', '_')}"]
+				if xid
+					env['xid'] = {@header_name => xid}
+					@root_logger.with_meta_context(xid: xid) do
+						return @app.call(env)
+					end
+				else
+					return @app.call(env)
+				end
+			ensure
+			end
+		end
+	end
+end

data/lib/unicorn-cuba-base/root_logger.rb

@@ -6,10 +6,7 @@ class RootLogger < Logger
 
 		def initialize(root_logger, class_obj)
 			@root_logger = root_logger
-			@progname = class_obj.name
-			@root_logger.formatter = proc do |severity, datetime, progname, msg|
-				"[#{datetime.utc.strftime "%Y-%m-%d %H:%M:%S.%6N %Z"}] [#{$$} #{progname}] #{severity}: #{msg}\n"
-			end
+			@class_name = class_obj.name
 		end
 
 		def respond_to?(method)
@@ -18,22 +15,24 @@ class RootLogger < Logger
 
 		def method_missing(name, *args, &block)
 			if @@levels.include? name
-				message = if block_given?
-					self.progname
+				root_logger = @root_logger.with_meta('className' => @class_name)
+
+				if block
+					root_logger.send(name, &block)
 				else
-					args.map do |arg|
-						if arg.is_a? Exception
-							"#{arg.class.name}: #{arg.message}\n#{arg.backtrace.join("\n")}"
-						else
-							arg.to_s
-						end
-					end.join(': ')
-				end
+					message = args.first
+
+					if args.last.is_a? Exception
+						error = args.last
+						root_logger = root_logger.with_meta('exceptionClass' => error.class.name)
+						message = "#{message}: #{error.class.name}: #{error.message}\n#{error.backtrace.join("\n")}"
+					end
 
-				# set program name to current class
-				@root_logger.progname = @progname
-				@root_logger.send(name, message.chomp, &block)
+					# log with class name
+					root_logger.send(name, message.chomp, &block)
+				end
 			else
+				# forward to root logger
 				@root_logger.send(name, *args, &block)
 			end
 		end
@@ -45,6 +44,50 @@ class RootLogger < Logger
 		end
 	end
 
+	class MetaData < Hash
+		def initialize(parent = nil)
+			@parent = parent
+		end
+
+		attr_accessor :parent
+
+		def to_s
+			chain = []
+			parent = self
+			while parent
+				chain << parent
+				parent = parent.parent
+			end
+
+			hash = {}
+
+			chain.reverse.each do |child|
+				hash.merge! child
+			end
+
+			"[meta #{hash.map{|k, v| "#{k}=\"#{v.to_s.tr('"', "'")}\""}.join(' ')}]"
+		end
+	end
+
+	def initialize(logdev = STDERR, &formatter)
+		super(logdev)
+
+		@ext_formatter = proc do |severity, datetime, progname, meta, msg|
+			if formatter
+				formatter.call(severity, datetime, progname, meta, msg)
+			else
+				"#{datetime.utc.strftime "%Y-%m-%d %H:%M:%S.%6N %Z"} #{meta.to_s} #{severity}: #{msg}\n"
+			end
+		end
+
+		@meta = MetaData.new
+		@meta['pid'] = $$
+
+		self.formatter = proc do |severity, datetime, progname, msg|
+			@ext_formatter.call(severity, datetime, progname, @meta, msg)
+		end
+	end
+
 	def logger_for(class_obj)
 		ClassLogger.new(self, class_obj)
 	end
@@ -53,11 +96,87 @@ class RootLogger < Logger
 		self
 	end
 
+	attr_accessor :meta
+
+	def with_meta(hash)
+		n = self.dup
+		n.meta = MetaData.new(@meta)
+		n.meta.merge! hash
+
+		# capture new meta hash with this new formatter proc - needed since old formatter proc will point to old object
+		n.formatter = proc do |severity, datetime, progname, msg|
+			@ext_formatter.call(severity, datetime, progname, n.meta, msg)
+		end
+		n
+	end
+
+	def with_meta_context(hash)
+		old_meta = @meta
+		new_meta = MetaData.new(old_meta)
+		new_meta.merge! hash
+
+		begin
+			@meta = new_meta
+			yield
+		ensure
+			@meta = old_meta
+		end
+	end
+
 	def inspect
 		"#<RootLogger #{"0x%X" % object_id}>"
 	end
 end
 
+class SyslogLogDev
+	def initialize(program_name, facility = 'daemon', log_to_stderr = false)
+		require 'syslog'
+
+		facility = "LOG_#{facility.upcase}".to_sym
+		Syslog.constants.include? facility or fail "No such syslog facility: #{facility}"
+		facility = Syslog.const_get facility
+
+		@log_level_mapping = Hash[%w{DEBUG INFO WARN ERROR FATAL}.zip(
+			[Syslog::LOG_DEBUG, Syslog::LOG_INFO, Syslog::LOG_WARNING, Syslog::LOG_ERR, Syslog::LOG_CRIT]
+		)]
+		@log_level_mapping.default = Syslog::LOG_NOTICE
+
+		flags = Syslog::LOG_PID | Syslog::LOG_NDELAY
+
+		if log_to_stderr
+			STDERR.sync = true
+			flags |= Syslog::LOG_PERROR
+		end
+
+		@syslog = Syslog.open(program_name, flags, facility)
+	end
+
+	def write(msg)
+		log_level, msg = *msg.match(/([^ ]+) (.*)/m).captures
+		@syslog.log(@log_level_mapping[log_level], "%s", msg.chomp)
+	end
+
+	def close
+		@syslog.close
+	end
+end
+
+class RootSyslogLogger < RootLogger
+	def initialize(program_name, facility = 'daemon', log_to_stderr = false)
+		super(SyslogLogDev.new(program_name, facility, log_to_stderr)) do |severity, datetime, progname, meta, msg|
+			# provide severity to SyslogLogDev
+			"#{severity} #{meta} #{msg}\n"
+		end
+
+		@meta.delete 'pid' # pid is already within syslog message header
+	end
+
+	# used when obj is used as log device (access logs)
+	def write(msg)
+		info(msg)
+	end
+end
+
 module ClassLogging
 	module ClassMethods
 		def init_logger
@@ -69,22 +188,16 @@ module ClassLogging
 		end
 
 		def log
-			unless @@logger[self]
-				new_root_logger = false
-				# use root logger from ancestor or create new one
-				root_logger = 
-					if logging_class = ancestors.find{|an| an != self and an.respond_to? :log}
-						logging_class.log.respond_to?(:root_logger) ? logging_class.log.root_logger : logging_class.log
-					else
-						new_root_logger = true
-						Logger.new(STDERR)
+			unless @@logger.include? self
+				root_logger = if an = ancestors.find{|an| an != self and an.respond_to? :log and an.log.respond_to? :root_logger}
+					an.log.root_logger
+				else
+					RootLogger.new.tap do |logger|
+						logger.warn 'no root logger found; using default logger'
 					end
+				end
 
-				root_logger.kind_of? RootLogger::ClassLogger and fail "got ClassLogger root logger: #{self}"
-
-				logger = RootLogger::ClassLogger.new(root_logger, self)
-				logger.warn "new default logger crated" if new_root_logger
-				@@logger[self] = logger
+				@@logger[self] = RootLogger::ClassLogger.new(root_logger, self)
 			end
 			@@logger[self]
 		end

data/lib/unicorn-cuba-base/stats_reporter.rb

@@ -1,8 +1,8 @@
-class StatsReporter < Controler
+class StatsReporter < Controller
 	def self.<<(stats)
 		(@@stats ||= []) << stats
 	end
-	
+
 	self.define do
 		all_stats = {}
 		@@stats.each do |stats|

data/lib/unicorn-cuba-base/uri_ext.rb

@@ -0,0 +1,20 @@
+require 'uri'
+
+module URI
+	class << self
+		alias_method :pct_decode, :decode
+	end
+
+	# From http://en.wikipedia.org/wiki/Percent-encoding:
+	# The generic URI syntax mandates that new URI schemes that provide for the representation of character data in a URI must, in effect, represent characters from the unreserved set without translation, and should convert all other characters to bytes according to UTF-8, and then percent-encode those values.
+	def self.utf_decode(str)
+		pct_decode(str).force_encoding('UTF-8').tap do |u|
+			raise URI::InvalidURIError, "invalid UTF-8 encoding in URI: #{u.inspect}" if not u.valid_encoding?
+		end
+	end
+
+	# Use it by default
+	def self.decode(str)
+		self.utf_decode(str)
+	end
+end

data/lib/unicorn-cuba-base.rb

@@ -6,6 +6,7 @@ require 'facter'
 require 'pathname'
 require 'ip'
 
+require_relative 'unicorn-cuba-base/uri_ext'
 require_relative 'unicorn-cuba-base/stats'
 require_relative 'unicorn-cuba-base/root_logger'
 require_relative 'unicorn-cuba-base/plugin/error_matcher'
@@ -15,8 +16,10 @@ require_relative 'unicorn-cuba-base/plugin/memory_limit'
 require_relative 'unicorn-cuba-base/rack/error_handling'
 require_relative 'unicorn-cuba-base/rack/unhandled_request'
 require_relative 'unicorn-cuba-base/rack/memory_limit'
+require_relative 'unicorn-cuba-base/rack/xid_logging'
+require_relative 'unicorn-cuba-base/rack/common_logger_xid'
 
-class Controler < Cuba
+class Controller < Cuba
 	include ClassLogging
 end
 
@@ -46,12 +49,19 @@ class Application
 		@cli = setup_cli(program_name, defaults, @cli_setup) or fail 'no cli defined'
 		@settings = @settings_setup ? setup_settings(@settings_setup) : @cli.parse!
 
-		root_logger = RootLogger.new(STDERR)
+		root_logger = if @settings.syslog_facility
+			# open /dev/null as log file if we are using syslog and we are not in foreground
+			@settings.log_file = Pathname.new '/dev/null' unless @settings.foreground
+			RootSyslogLogger.new(program_name, @settings.syslog_facility, @settings.foreground)
+		else
+			RootLogger.new
+		end
+
 		root_logger.level = RootLogger::WARN
 		root_logger.level = RootLogger::INFO if @settings.verbose
 		root_logger.level = RootLogger::DEBUG if @settings.debug
-		Controler.logger = root_logger
-		MemoryLimit.logger = Controler.logger_for(MemoryLimit)
+		Controller.logger = root_logger
+		MemoryLimit.logger = Controller.logger_for(MemoryLimit)
 
 		unicorn_settings = {}
 		unicorn_settings[:logger] = root_logger.logger_for(Unicorn::HttpServer)
@@ -67,7 +77,7 @@ class Application
 			unicorn_settings[:stderr_path] = @settings.log_file.to_s
 			unicorn_settings[:stdout_path] = @settings.log_file.to_s
 
-			Unicorn::Launcher.daemonize!(unicorn_settings) 
+			Unicorn::Launcher.daemonize!(unicorn_settings)
 
 			# capture startup messages
 			@settings.log_file.open('ab') do |log|
@@ -77,25 +87,30 @@ class Application
 			end
 		end
 
-		Controler.settings[:listeners] = @settings.listener
-		Controler.settings[:access_log_file] = @settings.access_log_file
-
-		Controler.plugin Plugin::ErrorMatcher
-		Controler.plugin Plugin::Logging
-		Controler.plugin Plugin::ResponseHelpers
-		Controler.plugin Plugin::MemoryLimit
-
-		@main_setup or fail 'no main controler provided'
-		main_controler = setup_main(@main_setup) or fail 'no main controler class returned'
-
-		access_log_file = @settings.access_log_file.open('a+')
-		access_log_file.sync = true
-		main_controler.use Rack::CommonLogger, access_log_file
-		main_controler.use Rack::MemoryLimit, @settings.limit_memory * 1024 ** 2
-		main_controler.use Rack::ErrorHandling
-		main_controler.use Rack::UnhandledRequest
+		Controller.settings[:listeners] = @settings.listener
+		#Controller.settings[:access_log_file] = @settings.access_log_file
+
+		Controller.plugin Plugin::ErrorMatcher
+		Controller.plugin Plugin::Logging
+		Controller.plugin Plugin::ResponseHelpers
+		Controller.plugin Plugin::MemoryLimit
+
+		@main_setup or fail 'no main controller provided'
+		main_controller = setup_main(@main_setup) or fail 'no main controller class returned'
+
+		main_controller.use Rack::ErrorHandling
+		main_controller.use Rack::XIDLogging, root_logger, @settings.xid_header if @settings.xid_header
+		if @settings.syslog_facility
+			main_controller.use Rack::CommonLoggerXID, root_logger.with_meta(type: 'http-access')
+		else
+			access_log_file = @settings.access_log_file.open('a+')
+			access_log_file.sync = true
+			main_controller.use Rack::CommonLogger, access_log_file
+		end
+		main_controller.use Rack::MemoryLimit, @settings.limit_memory * 1024 ** 2
+		main_controller.use Rack::UnhandledRequest
 
-		Unicorn::HttpServer.new(main_controler, unicorn_settings).start.join
+		Unicorn::HttpServer.new(main_controller, unicorn_settings).start.join
 	end
 
 	private
@@ -108,11 +123,17 @@ class Application
 				cast: Pathname,
 				description: 'log file location',
 				default: "#{program_name}.log"
+			option :syslog_facility,
+				short: :s,
+				description: 'when set logs will be sent to syslog instead of log files; one of: auth, authpriv, cron, daemon, ftp, kern, lpr, mail, news, syslog, user, uucp, local0, local1, local2, local3, local4, local5, local6, local7'
 			option :access_log_file,
 				short: :a,
 				cast: Pathname,
 				description: 'NCSA access log file location',
 				default: "#{program_name}_access.log"
+			option :xid_header,
+				short: :x,
+				description: 'log value of named request header with request context'
 			option :pid_file,
 				short: :p,
 				cast: Pathname,

data/spec/root_logger_spec.rb

@@ -3,7 +3,7 @@ require_relative 'spec_helper'
 require 'unicorn-cuba-base/root_logger'
 require 'stringio'
 
-describe  do
+describe RootLogger do
 	let! :log_out do
 		StringIO.new
 	end
@@ -44,15 +44,109 @@ describe  do
 			subject.logger_for(String).info 'hello world'
 			log_out.string.should include 'String'
 		end
+	end
+
+	it 'should log exceptions' do
+		begin
+			raise RuntimeError, 'bad luck'
+		rescue => error
+			subject.logger_for(String).error 'hello world', error
+		end
+		log_out.string.should include 'hello world: RuntimeError: bad luck'
+	end
+
+	describe 'meta data' do
+		it 'should log with metadata in RFC5424 format' do
+			subject.with_meta(type: 'access-log').info 'GET /asdfas'
+			log_out.string.should include 'type="access-log"'
 
-		it 'should log exceptions' do
-			begin
-				raise RuntimeError, 'bad luck'
-			rescue => error
-				subject.logger_for(String).error 'hello world', error
+			subject.info 'GET /asdfas'
+			log_out.string.lines.to_a.last.should_not include 'type="access-log"'
+		end
+
+		it 'should work with chaining' do
+			subject.with_meta(type: 'access-log').with_meta(blah: 'xxx').info 'GET /asdfas'
+			log_out.string.should include 'type="access-log" blah="xxx"'
+		end
+
+		it 'should log with metadata context' do
+			subject.with_meta_context(type: 'app-log') do
+				subject.info 'GET /asdfas'
 			end
-			log_out.string.should include 'hello world: RuntimeError: bad luck'
+			log_out.string.should include 'type="app-log"'
+
+			subject.info 'GET /asdfas'
+			log_out.string.lines.to_a.last.should_not include 'type="app-log"'
 		end
 	end
 end
 
+require 'capture-output'
+
+describe SyslogLogDev do
+	subject do
+		SyslogLogDev.new('unicorn-cuba-base-test', 'daemon', true)
+	end
+
+	after :each do
+		subject.close
+	end
+
+	it 'should write messages to syslog expecting first word to be log level' do
+		Capture.stderr{subject.write 'INFO hello world'}.should include '<Info>'
+		Capture.stderr{subject.write 'WARN hello world'}.should include '<Warning>'
+		Capture.stderr{subject.write 'INFO hello world'}.should include 'hello world'
+	end
+
+	it 'should handle multiline log entries' do
+		Capture.stderr{subject.write "INFO hello\nworld"}.should include "<Info>: hello\n\tworld\n"
+	end
+end
+
+describe RootSyslogLogger do
+	subject do
+		@subject ||= RootSyslogLogger.new('unicorn-cuba-base-test', 'daemon', true).logger_for(RSpec)
+	end
+
+	after :each do
+		subject.close
+	end
+
+	it 'should log to syslog' do
+		log_out = Capture.stderr{subject.info 'hello world'}
+
+		log_out.should include 'unicorn-cuba-base-test'
+		log_out.should match /\[[0-9]+\]/
+		log_out.should include '<Info>:'
+	end
+
+	it 'should include message' do
+		Capture.stderr{subject.info 'hello world'}.should include 'hello world'
+	end
+
+	it 'should include class name' do
+		Capture.stderr{subject.info 'hello world'}.should include 'RSpec'
+	end
+
+	it 'should map log levels to syslog severities' do
+		Capture.stderr{subject.debug 'hello world'}.should include '<Debug>'
+		Capture.stderr{subject.info 'hello world'}.should include '<Info>'
+		Capture.stderr{subject.warn 'hello world'}.should include '<Warning>'
+		Capture.stderr{subject.error 'hello world'}.should include '<Error>'
+		Capture.stderr{subject.fatal 'hello world'}.should include '<Critical>'
+	end
+
+	it 'should handle multiline logs by appending tab after new line (done by syslog?)' do
+		Capture.stderr{subject.info "hello\nworld\ntest"}.should include "hello\n\tworld\n\ttest\n"
+	end
+
+	describe 'direct wirtes' do
+		it 'should use Info level' do
+			Capture.stderr{subject.write "hello world"}.should include '<Info>'
+		end
+
+		it 'should allow use of meta data' do
+			Capture.stderr{subject.with_meta('type' => 'access-log').write "hello world"}.should include 'type="access-log"'
+		end
+	end
+end

data/unicorn-cuba-base.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "unicorn-cuba-base"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jakub Pastuszek"]
-  s.date = "2013-10-22"
+  s.date = "2014-07-28"
   s.description = "web application base powered by Unicorn HTTP server and based on Cuba framework extended with additional Rack middleware and Cuba plugins"
   s.email = "jpastuszek@gmail.com"
   s.extra_rdoc_files = [
@@ -32,12 +32,15 @@ Gem::Specification.new do |s|
     "lib/unicorn-cuba-base/plugin/logging.rb",
     "lib/unicorn-cuba-base/plugin/memory_limit.rb",
     "lib/unicorn-cuba-base/plugin/response_helpers.rb",
+    "lib/unicorn-cuba-base/rack/common_logger_xid.rb",
     "lib/unicorn-cuba-base/rack/error_handling.rb",
     "lib/unicorn-cuba-base/rack/memory_limit.rb",
     "lib/unicorn-cuba-base/rack/unhandled_request.rb",
+    "lib/unicorn-cuba-base/rack/xid_logging.rb",
     "lib/unicorn-cuba-base/root_logger.rb",
     "lib/unicorn-cuba-base/stats.rb",
     "lib/unicorn-cuba-base/stats_reporter.rb",
+    "lib/unicorn-cuba-base/uri_ext.rb",
     "spec/memory_limit_spec.rb",
     "spec/root_logger_spec.rb",
     "spec/spec_helper.rb",
@@ -46,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/jpastuszek/unicorn-cuba-base"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.23"
   s.summary = "web appliaction base powered by Unicorn and Cuba"
 
   if s.respond_to? :specification_version then
@@ -62,6 +65,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, ["~> 2.13"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<capture-output>, ["~> 1.0"])
     else
       s.add_dependency(%q<cuba>, ["~> 3.0"])
       s.add_dependency(%q<unicorn>, [">= 4.6.2"])
@@ -72,6 +76,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, ["~> 2.13"])
       s.add_dependency(%q<rdoc>, ["~> 3.9"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<capture-output>, ["~> 1.0"])
     end
   else
     s.add_dependency(%q<cuba>, ["~> 3.0"])
@@ -83,6 +88,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, ["~> 2.13"])
     s.add_dependency(%q<rdoc>, ["~> 3.9"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<capture-output>, ["~> 1.0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-cuba-base
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -155,6 +155,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: capture-output
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: web application base powered by Unicorn HTTP server and based on Cuba
   framework extended with additional Rack middleware and Cuba plugins
 email: jpastuszek@gmail.com
@@ -179,12 +195,15 @@ files:
 - lib/unicorn-cuba-base/plugin/logging.rb
 - lib/unicorn-cuba-base/plugin/memory_limit.rb
 - lib/unicorn-cuba-base/plugin/response_helpers.rb
+- lib/unicorn-cuba-base/rack/common_logger_xid.rb
 - lib/unicorn-cuba-base/rack/error_handling.rb
 - lib/unicorn-cuba-base/rack/memory_limit.rb
 - lib/unicorn-cuba-base/rack/unhandled_request.rb
+- lib/unicorn-cuba-base/rack/xid_logging.rb
 - lib/unicorn-cuba-base/root_logger.rb
 - lib/unicorn-cuba-base/stats.rb
 - lib/unicorn-cuba-base/stats_reporter.rb
+- lib/unicorn-cuba-base/uri_ext.rb
 - spec/memory_limit_spec.rb
 - spec/root_logger_spec.rb
 - spec/spec_helper.rb
@@ -204,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4100788801450601384
+      hash: 668318932229336882
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -213,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: web appliaction base powered by Unicorn and Cuba