passenger 4.0.45 → 4.0.46

data/test/ruby/request_handler_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 PhusionPassenger.require_passenger_lib 'request_handler'
 PhusionPassenger.require_passenger_lib 'request_handler/thread_handler'
 PhusionPassenger.require_passenger_lib 'rack/thread_handler_extension'
-PhusionPassenger.require_passenger_lib 'analytics_logger'
+PhusionPassenger.require_passenger_lib 'union_station/core'
 PhusionPassenger.require_passenger_lib 'utils'
 
 require 'fileutils'
@@ -512,7 +512,7 @@ describe RequestHandler do
 		end
 	end
 
-	describe "if analytics logger is given" do
+	describe "if Union Station core is given" do
 		def preinitialize
 			if @agent_pid
 				Process.kill('KILL', @agent_pid)
@@ -523,9 +523,9 @@ describe RequestHandler do
 			@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(@dump_file,
 				@logging_agent_password)
 			
-			@logger = AnalyticsLogger.new(@socket_address, "logging",
+			@union_station_core = UnionStation::Core.new(@socket_address, "logging",
 				"1234", "localhost")
-			@options = { "analytics_logger" => @logger }
+			@options = { "union_station_core" => @union_station_core }
 		end
 		
 		after :each do
@@ -543,8 +543,8 @@ describe RequestHandler do
 			header_value = nil
 			thread_value = nil
 			@thread_handler.any_instance.should_receive(:process_request).and_return do |headers, connection, full_http_response|
-				header_value = headers[PASSENGER_ANALYTICS_WEB_LOG]
-				thread_value = Thread.current[PASSENGER_ANALYTICS_WEB_LOG]
+				header_value = headers[UNION_STATION_REQUEST_TRANSACTION]
+				thread_value = Thread.current[UNION_STATION_REQUEST_TRANSACTION]
 			end
 			@request_handler.start_main_loop_thread
 			client = connect
@@ -557,8 +557,8 @@ describe RequestHandler do
 			ensure
 				client.close
 			end
-			header_value.should be_kind_of(AnalyticsLogger::Log)
-			thread_value.should be_kind_of(AnalyticsLogger::Log)
+			header_value.should be_kind_of(UnionStation::Transaction)
+			thread_value.should be_kind_of(UnionStation::Transaction)
 			header_value.should == thread_value
 		end
 		

data/test/ruby/shared/rails/{analytics_logging_extensions_sharedspec.rb → union_station_extensions_sharedspec.rb}

@@ -1,12 +1,12 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'socket'
 require 'fileutils'
-PhusionPassenger.require_passenger_lib 'analytics_logger'
+PhusionPassenger.require_passenger_lib 'union_station/core'
 PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 
 module PhusionPassenger
 
-shared_examples_for "analytics logging extensions for Rails" do
+shared_examples_for "Union Station extensions for Rails" do
 	before :each do
 		@logging_agent_password = "1234"
 		@dump_file = "#{Utils.passenger_tmpdir}/log.txt"
@@ -43,13 +43,13 @@ shared_examples_for "analytics logging extensions for Rails" do
 		return [data].pack('m').gsub("\n", "")
 	end
 	
-	it "doesn't install analytics logging extensions if analytics logging is turned off" do
+	it "doesn't install Union Station extensions if analytics logging is turned off" do
 		@options.delete("analytics")
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
 				def index
 					File.open("out.txt", "w") do |f|
-						f.write(request.env["PASSENGER_ANALYTICS_WEB_LOG"].class.to_s)
+						f.write(request.env["UNION_STATION_REQUEST_TRANSACTION"].class.to_s)
 					end
 					render :nothing => true
 				end
@@ -305,6 +305,7 @@ shared_examples_for "analytics logging extensions for Rails" do
 			File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 				class FooController < ActionController::Base
 					def index
+						STDERR.puts 'hi'
 						Rails.cache.write("key1", "foo")
 						Rails.cache.write("key2", "foo")
 						Rails.cache.write("key3", "foo")

data/test/ruby/union_station_spec.rb

@@ -0,0 +1,283 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'stringio'
+PhusionPassenger.require_passenger_lib 'union_station/core'
+
+module PhusionPassenger
+
+describe UnionStation::Core do
+	YESTERDAY = Time.utc(2010, 4, 11, 11, 56, 02)
+	TODAY     = Time.utc(2010, 4, 11, 12, 56, 02)
+	TOMORROW  = Time.utc(2010, 4, 11, 13, 56, 02)
+	
+	before :each do
+		@username  = "logging"
+		@password  = "1234"
+		@dump_file = Utils.passenger_tmpdir + "/transaction.txt"
+		start_agent
+		@core      = UnionStation::Core.new(@socket_address, @username, @password, "localhost")
+		@core2     = UnionStation::Core.new(@socket_address, @username, @password, "localhost")
+	end
+	
+	after :each do
+		@core.close
+		@core2.close
+		if @agent_pid
+			Process.kill('KILL', @agent_pid)
+			Process.waitpid(@agent_pid)
+		end
+	end
+	
+	def mock_time(time)
+		UnionStation::Core.stub(:current_time).and_return(time)
+	end
+	
+	def start_agent
+		@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(@dump_file, @password)
+	end
+	
+	def kill_agent
+		if @agent_pid
+			Process.kill('KILL', @agent_pid)
+			Process.waitpid(@agent_pid)
+			File.unlink(@socket_filename)
+			@agent_pid = nil
+		end
+	end
+	
+	specify "logging with #new_transaction works" do
+		mock_time(TODAY)
+		
+		transaction = @core.new_transaction("foobar")
+		transaction.should_not be_null
+		begin
+			transaction.message("hello")
+		ensure
+			transaction.close(true)
+		end
+		
+		File.read(@dump_file).should =~ /hello/
+		
+		transaction = @core.new_transaction("foobar", :processes)
+		transaction.should_not be_null
+		begin
+			transaction.message("world")
+		ensure
+			transaction.close(true)
+		end
+		
+		File.read(@dump_file).should =~ /world/
+	end
+	
+	specify "#new_transaction reestablishes the connection if disconnected" do
+		mock_time(TODAY)
+		
+		@core.new_transaction("foobar").close(true)
+		connection = @core.instance_variable_get(:"@connection")
+		connection.synchronize do
+			connection.channel.close
+			connection.channel = nil
+		end
+		
+		transaction = @core.new_transaction("foobar")
+		begin
+			transaction.message("hello")
+		ensure
+			transaction.close(true)
+		end
+		
+		File.read(@dump_file).should =~ /hello/
+	end
+	
+	specify "#new_transaction does not reconnect to the server for a short period of time if connecting failed" do
+		@core.reconnect_timeout = 60
+		@core.max_connect_tries = 1
+		
+		mock_time(TODAY)
+		kill_agent
+		@core.new_transaction("foobar").should be_null
+		
+		mock_time(TODAY + 30)
+		start_agent
+		@core.new_transaction("foobar").should be_null
+		
+		mock_time(TODAY + 61)
+		@core.new_transaction("foobar").should_not be_null
+	end
+	
+	specify "logging with #continue_transaction works" do
+		mock_time(TODAY)
+		
+		transaction = @core.new_transaction("foobar", :processes)
+		begin
+			transaction.message("hello")
+			transaction2 = @core2.continue_transaction(transaction.txn_id, "foobar", :processes)
+			transaction2.should_not be_null
+			transaction2.txn_id.should == transaction.txn_id
+			begin
+				transaction2.message("world")
+			ensure
+				transaction2.close(true)
+			end
+		ensure
+			transaction.close(true)
+		end
+		
+		File.read(@dump_file).should =~ /#{Regexp.escape transaction.txn_id} .* hello$/
+		File.read(@dump_file).should =~ /#{Regexp.escape transaction.txn_id} .* world$/
+	end
+	
+	specify "#continue_transaction reestablishes the connection if disconnected" do
+		mock_time(TODAY)
+		
+		transaction = @core.new_transaction("foobar")
+		transaction.close(true)
+		transaction2 = @core2.continue_transaction(transaction.txn_id, "foobar")
+		transaction2.close(true)
+		
+		connection = @core2.instance_variable_get(:"@connection")
+		connection.synchronize do
+			connection.channel.close
+			connection.channel = nil
+		end
+		
+		transaction2 = @core2.continue_transaction(transaction.txn_id, "foobar")
+		begin
+			transaction2.message("hello")
+		ensure
+			transaction2.close(true)
+		end
+		
+		File.read(@dump_file).should =~ /hello/
+	end
+	
+	specify "#new_transaction and #continue_transaction eventually reestablish the connection to the logging server if the logging server crashed and was restarted" do
+		mock_time(TODAY)
+		
+		transaction = @core.new_transaction("foobar")
+		@core2.continue_transaction(transaction.txn_id, "foobar").close
+		kill_agent
+		start_agent
+		
+		transaction = @core.new_transaction("foobar")
+		transaction.should be_null
+		transaction2 = @core2.continue_transaction("1234-abcd", "foobar")
+		transaction2.should be_null
+		
+		mock_time(TODAY + 60)
+		transaction = @core.new_transaction("foobar")
+		transaction2 = @core2.continue_transaction(transaction.txn_id, "foobar")
+		begin
+			transaction2.message("hello")
+		ensure
+			transaction2.close(true)
+		end
+		transaction.close(true)
+		
+		File.read(@dump_file).should =~ /hello/
+	end
+	
+	specify "#continue_transaction does not reconnect to the server for a short period of time if connecting failed" do
+		@core.reconnect_timeout = 60
+		@core.max_connect_tries = 1
+		@core2.reconnect_timeout = 60
+		@core2.max_connect_tries = 1
+		
+		mock_time(TODAY)
+		transaction = @core.new_transaction("foobar")
+		@core2.continue_transaction(transaction.txn_id, "foobar")
+		kill_agent
+		@core2.continue_transaction(transaction.txn_id, "foobar").should be_null
+		
+		mock_time(TODAY + 30)
+		start_agent
+		@core2.continue_transaction(transaction.txn_id, "foobar").should be_null
+		
+		mock_time(TODAY + 61)
+		@core2.continue_transaction(transaction.txn_id, "foobar").should_not be_null
+	end
+	
+	it "only creates null Transaction objects if no server address is given" do
+		core = UnionStation::Core.new(nil, nil, nil, nil)
+		begin
+			core.new_transaction("foobar").should be_null
+		ensure
+			core.close
+		end
+	end
+	
+	specify "#clear_connection closes the connection" do
+		@core.new_transaction("foobar").close
+		@core.clear_connection
+		connection = @core.instance_variable_get(:"@connection")
+		connection.synchronize do
+			connection.channel.should be_nil
+		end
+	end
+
+	describe "transaction objects" do
+		it "becomes null once it is closed" do
+			transaction = @core.new_transaction("foobar")
+			transaction.close
+			transaction.should be_null
+		end
+
+		it "does nothing if it's null" do
+			logger = UnionStation::Core.new(nil, nil, nil, nil)
+			begin
+				transaction = logger.new_transaction("foobar")
+				transaction.message("hello")
+				transaction.close(true)
+			ensure
+				logger.close
+			end
+			
+			File.exist?("#{@log_dir}/1").should be_false
+		end
+
+		describe "#begin_measure" do
+			it "sends a BEGIN message" do
+				transaction = @core.new_transaction("foobar")
+				begin
+					transaction.should_receive(:message).with(/^BEGIN: hello \(.+?,.+?,.+?\) $/)
+					transaction.begin_measure("hello")
+				ensure
+					transaction.close
+				end
+			end
+
+			it "adds extra information as base64" do
+				transaction = @core.new_transaction("foobar")
+				begin
+					transaction.should_receive(:message).with(/^BEGIN: hello \(.+?,.+?,.+?\) YWJjZA==$/)
+					transaction.begin_measure("hello", "abcd")
+				ensure
+					transaction.close
+				end
+			end
+		end
+
+		describe "#end_measure" do
+			it "sends an END message if error_countered=false" do
+				transaction = @core.new_transaction("foobar")
+				begin
+					transaction.should_receive(:message).with(/^END: hello \(.+?,.+?,.+?\)$/)
+					transaction.end_measure("hello")
+				ensure
+					transaction.close
+				end
+			end
+
+			it "sends a FAIL message if error_countered=true" do
+				transaction = @core.new_transaction("foobar")
+				begin
+					transaction.should_receive(:message).with(/^FAIL: hello \(.+?,.+?,.+?\)$/)
+					transaction.end_measure("hello", true)
+				ensure
+					transaction.close
+				end
+			end
+		end
+	end
+end
+
+end # module PhusionPassenger

data/test/stub/wsgi/passenger_wsgi.py

@@ -49,10 +49,28 @@ def application(env, start_response):
 		second = params['second'][0]
 		body = "Method: %s\nFirst: %s\nSecond: %s\n" % (method, first, second)
 	elif path == '/chunked':
-		chunks = [str("7\r\nchunk1\n\r\n"), str("7\r\nchunk2\n\r\n"),
-			str("7\r\nchunk3\n\r\n"), str("0\r\n\r\n")]
+		def body():
+			yield str("7\r\nchunk1\n\r\n")
+			yield str("7\r\nchunk2\n\r\n")
+			yield str("7\r\nchunk3\n\r\n")
+			yield str("0\r\n\r\n")
+			sleep_time = float(env.get('HTTP_X_SLEEP_WHEN_DONE', 0))
+			time.sleep(sleep_time)
+			if env.get('HTTP_X_EXTRA_DATA') is not None:
+				status = False
+				try:
+					yield str("7\r\nchunk4\n\r\n")
+					status = True
+				finally:
+					filename = env.get('HTTP_X_TAIL_STATUS_FILE')
+					if filename is not None:
+						f = open(filename, "w")
+						try:
+							f.write(str(status))
+						finally:
+							f.close()
 		start_response(status, [('Content-Type', 'text/html'), ('Transfer-Encoding', 'chunked')])
-		return chunks
+		return body()
 	elif path == '/pid':
 		body = os.getpid()
 	elif path.startswith('/env'):
@@ -133,13 +151,31 @@ def application(env, start_response):
 		body = 'ok'
 	elif path == '/blob':
 		size = int(env.get('HTTP_X_SIZE', 1024 * 1024 * 10))
+		headers = [('Content-Type', 'text/plain')]
+		if env.get('HTTP_X_CONTENT_LENGTH') is not None:
+			headers.append(('Content-Length', size))
 		def body():
 			written = 0
 			while written < size:
 				data = 'x' * min(1024 * 8, size - written)
 				yield(data)
 				written += len(data)
-		start_response(status, [('Content-Type', 'text/plain')])
+			sleep_time = float(env.get('HTTP_X_SLEEP_WHEN_DONE', 0))
+			time.sleep(sleep_time)
+			if env.get('HTTP_X_EXTRA_DATA') is not None:
+				status = False
+				try:
+					yield str("tail")
+					status = True
+				finally:
+					filename = env.get('HTTP_X_TAIL_STATUS_FILE')
+					if filename is not None:
+						f = open(filename, "w")
+						try:
+							f.write(str(status))
+						finally:
+							f.close()
+		start_response(status, headers)
 		return body()
 	elif path == '/oobw':
 		start_response(status, [('Content-Type', 'text/plain'), ('X-Passenger-Request-OOB-Work', 'true')])
@@ -150,7 +186,7 @@ def application(env, start_response):
 			body = str('Invalid headers')
 			start_response(status, [('Content-Type', 'text/plain'), ('Content-Length', len(body))])
 			return [body]
-		socket = env['passenger.hijack']()
+		socket = env['passenger.hijack'](True)
 		io = socket.makefile()
 		socket.close()
 		try:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passenger
 version: !ruby/object:Gem::Version
-  version: 4.0.45
+  version: 4.0.46
 platform: ruby
 authors:
 - Phusion - http://www.phusion.nl/
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,7 @@ extensions:
 - helper-scripts/download_binaries/extconf.rb
 extra_rdoc_files: []
 files:
+- .editorconfig
 - .gitignore
 - .travis.yml
 - CHANGELOG
@@ -165,6 +166,7 @@ files:
 - doc/Users guide.html
 - doc/Users guide.txt
 - doc/images/by_sa.png
+- doc/images/code_walkthrough.jpg
 - doc/images/direct_spawning.png
 - doc/images/direct_spawning.svg
 - doc/images/glyphicons-halflings-white.png
@@ -2149,6 +2151,7 @@ files:
 - ext/common/ApplicationPool2/ComponentInfo.h
 - ext/common/ApplicationPool2/DirectSpawner.h
 - ext/common/ApplicationPool2/DummySpawner.h
+- ext/common/ApplicationPool2/ErrorRenderer.h
 - ext/common/ApplicationPool2/Group.h
 - ext/common/ApplicationPool2/Implementation.cpp
 - ext/common/ApplicationPool2/Options.h
@@ -2212,6 +2215,7 @@ files:
 - ext/common/Utils/IOUtils.cpp
 - ext/common/Utils/IOUtils.h
 - ext/common/Utils/IniFile.h
+- ext/common/Utils/JsonUtils.h
 - ext/common/Utils/LargeFiles.cpp
 - ext/common/Utils/LargeFiles.h
 - ext/common/Utils/Lock.h
@@ -2373,14 +2377,12 @@ files:
 - helper-scripts/rack-loader.rb
 - helper-scripts/rack-preloader.rb
 - helper-scripts/wsgi-loader.py
-- helper-scripts/wsgi-preloader.py
 - lib/phusion_passenger.rb
 - lib/phusion_passenger/abstract_installer.rb
 - lib/phusion_passenger/active_support3_extensions/init.rb
 - lib/phusion_passenger/admin_tools.rb
 - lib/phusion_passenger/admin_tools/memory_stats.rb
 - lib/phusion_passenger/admin_tools/server_instance.rb
-- lib/phusion_passenger/analytics_logger.rb
 - lib/phusion_passenger/apache2/config_options.rb
 - lib/phusion_passenger/classic_rails/cgi_fixed.rb
 - lib/phusion_passenger/classic_rails/thread_handler_extension.rb
@@ -2436,7 +2438,6 @@ files:
 - lib/phusion_passenger/standalone/config_file.rb
 - lib/phusion_passenger/standalone/help_command.rb
 - lib/phusion_passenger/standalone/main.rb
-- lib/phusion_passenger/standalone/package_runtime_command.rb
 - lib/phusion_passenger/standalone/runtime_installer.rb
 - lib/phusion_passenger/standalone/runtime_locator.rb
 - lib/phusion_passenger/standalone/start_command.rb
@@ -2444,12 +2445,16 @@ files:
 - lib/phusion_passenger/standalone/stop_command.rb
 - lib/phusion_passenger/standalone/utils.rb
 - lib/phusion_passenger/standalone/version_command.rb
+- lib/phusion_passenger/union_station/connection.rb
+- lib/phusion_passenger/union_station/core.rb
+- lib/phusion_passenger/union_station/transaction.rb
 - lib/phusion_passenger/utils.rb
 - lib/phusion_passenger/utils/ansi_colors.rb
 - lib/phusion_passenger/utils/download.rb
 - lib/phusion_passenger/utils/file_system_watcher.rb
 - lib/phusion_passenger/utils/hosts_file_parser.rb
 - lib/phusion_passenger/utils/json.rb
+- lib/phusion_passenger/utils/lock.rb
 - lib/phusion_passenger/utils/native_support_utils.rb
 - lib/phusion_passenger/utils/tee_input.rb
 - lib/phusion_passenger/utils/terminal_choice_menu.rb
@@ -2577,7 +2582,6 @@ files:
 - test/oxt/spin_lock_test.cpp
 - test/oxt/syscall_interruption_test.cpp
 - test/ruby/admin_tools_spec.rb
-- test/ruby/analytics_logger_spec.rb
 - test/ruby/classic_rails/loader_spec.rb
 - test/ruby/classic_rails/preloader_spec.rb
 - test/ruby/debug_logging_spec.rb
@@ -2594,11 +2598,12 @@ files:
 - test/ruby/rails4.0/preloader_spec.rb
 - test/ruby/request_handler_spec.rb
 - test/ruby/shared/loader_sharedspec.rb
-- test/ruby/shared/rails/analytics_logging_extensions_sharedspec.rb
+- test/ruby/shared/rails/union_station_extensions_sharedspec.rb
 - test/ruby/shared/ruby_loader_sharedspec.rb
 - test/ruby/spec_helper.rb
 - test/ruby/standalone/runtime_installer_spec.rb
 - test/ruby/standalone/runtime_locator_spec.rb
+- test/ruby/union_station_spec.rb
 - test/ruby/utils/file_system_watcher_spec.rb
 - test/ruby/utils/hosts_file_parser.rb
 - test/ruby/utils/tee_input_spec.rb