passenger 4.0.60 → 5.0.0.beta1

data/test/ruby/shared/loader_sharedspec.rb

@@ -98,10 +98,10 @@ private
 	end
 
 	def write_start_request(options)
-		write_request_line "passenger_root: #{PhusionPassenger.source_root}"
+		write_request_line "passenger_root: #{PhusionPassenger.install_spec}"
 		write_request_line "ruby_libdir: #{PhusionPassenger.ruby_libdir}"
-		write_request_line "generation_dir: #{Utils.passenger_tmpdir}"
-		write_request_line "log_level: 3" if DEBUG
+		write_request_line "keepalive: false"
+		write_request_line "log_level: 6" if DEBUG
 		options.each_pair do |key, value|
 			write_request_line "#{key}: #{value}"
 		end
@@ -144,7 +144,7 @@ class Preloader < Loader
 		begin
 			loader.send(:write_request_line, "spawn")
 			loader.send(:write_start_request, options)
-			
+
 			line = loader.output.readline
 			puts "<--- #{line.strip}" if DEBUG
 			if line != "OK\n"
@@ -173,7 +173,7 @@ module LoaderSpecHelper
 		klass.before(:each) do
 			@stubs = []
 		end
-		
+
 		klass.after(:each) do
 			begin
 				@loader.close if @loader
@@ -185,22 +185,22 @@ module LoaderSpecHelper
 			end
 		end
 	end
-	
+
 	def before_start(code)
 		@before_start = code
 	end
-	
+
 	def after_start(code)
 		@after_start = code
 	end
-	
+
 	def register_stub(stub)
 		@stubs << stub
 		File.prepend(stub.startup_file, "#{@before_start}\n")
 		File.append(stub.startup_file, "\n#{@after_start}")
 		return stub
 	end
-	
+
 	def register_app(app)
 		@apps << app
 		return app
@@ -217,6 +217,7 @@ module LoaderSpecHelper
 		socket = @loader.connect_and_send_request(headers)
 		headers = {}
 		line = socket.readline
+		headers["Status"] = line.split(" ")[1]
 		while line != "\r\n"
 			key, value = line.strip.split(/ *: */, 2)
 			headers[key] = value

data/test/ruby/shared/rails/union_station_extensions_sharedspec.rb

@@ -1,17 +1,18 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'socket'
 require 'fileutils'
+require 'tmpdir'
 PhusionPassenger.require_passenger_lib 'union_station/core'
-PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 
 module PhusionPassenger
 
 shared_examples_for "Union Station extensions for Rails" do
 	before :each do
 		@logging_agent_password = "1234"
-		@dump_file = "#{Utils.passenger_tmpdir}/log.txt"
-		@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(@dump_file,
-			@logging_agent_password)
+		@us_tmpdir = Dir.mktmpdir
+		@dump_file = "#{@us_tmpdir}/log.txt"
+		@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(@us_tmpdir,
+			@dump_file, @logging_agent_password)
 		@options = {
 			"analytics" => true,
 			"logging_agent_address" => @socket_address,
@@ -21,28 +22,29 @@ shared_examples_for "Union Station extensions for Rails" do
 			"app_group_name" => "foobar"
 		}
 	end
-	
+
 	after :each do
+		FileUtils.rm_rf(@us_tmpdir) if @us_tmpdir
 		@connection.close if @connection && @connection.closed?
 		Process.kill('KILL', @agent_pid)
 		Process.waitpid(@agent_pid)
 	end
-	
+
 	def send_request_to_app(headers)
 		headers = {
 			"PASSENGER_TXN_ID"     => "1234-abcd"
 		}.merge(headers)
 		return perform_request(headers)
 	end
-	
+
 	def read_log
 		return File.read(@dump_file)
 	end
-	
+
 	def base64(data)
 		return [data].pack('m').gsub("\n", "")
 	end
-	
+
 	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{
@@ -62,7 +64,7 @@ shared_examples_for "Union Station extensions for Rails" do
 			File.exist?(filename) && File.read(filename) == "NilClass"
 		end
 	end
-	
+
 	it "logs the controller and action name" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -79,7 +81,7 @@ shared_examples_for "Union Station extensions for Rails" do
 			log.include?("Controller action: FooController#index\n")
 		end
 	end
-	
+
 	it "logs uncaught exceptions in controller actions" do
 		File.write("#{@stub.app_root}/app/controllers/crash_controller.rb", %Q{
 			class CrashController < ActionController::Base
@@ -100,7 +102,7 @@ shared_examples_for "Union Station extensions for Rails" do
 				log.include?("Controller action: CrashController#index")
 		end
 	end
-	
+
 	it "logs ActionController benchmarks" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -125,7 +127,7 @@ shared_examples_for "Union Station extensions for Rails" do
 				log.include?('END: BENCHMARK: hello')
 		end
 	end
-	
+
 	it "logs ActionView benchmarks" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -145,7 +147,7 @@ shared_examples_for "Union Station extensions for Rails" do
 				log.include?('END: BENCHMARK: hello')
 		end
 	end
-	
+
 	it "logs successful SQL queries" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -189,7 +191,7 @@ shared_examples_for "Union Station extensions for Rails" do
 				log =~ /END: DB BENCHMARK: .* \(.*\)$/
 		end
 	end
-	
+
 	it "logs failed SQL queries" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -220,7 +222,7 @@ shared_examples_for "Union Station extensions for Rails" do
 			end
 		end
 	end
-	
+
 	it "logs controller processing time of successful actions" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -238,7 +240,7 @@ shared_examples_for "Union Station extensions for Rails" do
 				log.include?("END: framework request processing")
 		end
 	end
-	
+
 	it "logs controller processing time of failed actions" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -256,7 +258,7 @@ shared_examples_for "Union Station extensions for Rails" do
 				log.include?("FAIL: framework request processing")
 		end
 	end
-	
+
 	it "logs view rendering time of successful actions" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -278,7 +280,7 @@ shared_examples_for "Union Station extensions for Rails" do
 				log =~ /View rendering time: \d+$/
 		end
 	end
-	
+
 	it "logs view rendering time of failed actions" do
 		File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{
 			class FooController < ActionController::Base
@@ -299,13 +301,12 @@ shared_examples_for "Union Station extensions for Rails" do
 				log.include?("FAIL: view rendering")
 		end
 	end
-	
+
 	it "logs cache hits" do
 		if rails_version >= '2.1'
 			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")
@@ -327,7 +328,7 @@ shared_examples_for "Union Station extensions for Rails" do
 			end
 		end
 	end
-	
+
 	it "logs cache misses" do
 		if rails_version >= '2.1'
 			File.write("#{@stub.app_root}/app/controllers/foo_controller.rb", %Q{

data/test/ruby/spec_helper.rb

@@ -28,7 +28,6 @@ def boolean_option(name, default_value = false)
 end
 
 DEBUG = boolean_option('DEBUG')
-TEST_CLASSIC_RAILS = boolean_option('TEST_CLASSIC_RAILS', Gem::VERSION <= '1.9')
 
 ENV.delete('PASSENGER_DEBUG')
 
@@ -42,7 +41,6 @@ require 'phusion_passenger'
 PhusionPassenger.locate_directories
 PhusionPassenger.require_passenger_lib 'debug_logging'
 PhusionPassenger.require_passenger_lib 'utils'
-PhusionPassenger.require_passenger_lib 'utils/tmpdir'
 require 'support/test_helper'
 
 include TestHelper
@@ -103,21 +101,14 @@ DEADLINE_TIMER = DeadlineTimer.new(Thread.current, 30)
 RSpec.configure do |config|
 	config.before(:each) do
 		# Suppress warning messages.
-		PhusionPassenger::DebugLogging.log_level = -1
+		PhusionPassenger::DebugLogging.log_level = PhusionPassenger::LVL_CRIT
 		PhusionPassenger::DebugLogging.log_file = nil
 		PhusionPassenger::DebugLogging.stderr_evaluator = nil
-		
-		# Create the temp directory.
-		PhusionPassenger::Utils.passenger_tmpdir
 
 		DEADLINE_TIMER.start
 	end
-	
+
 	config.after(:each) do
-		tmpdir = PhusionPassenger::Utils.passenger_tmpdir(false)
-		if File.exist?(tmpdir)
-			remove_dir_tree(tmpdir)
-		end
 		DEADLINE_TIMER.stop
 	end
 end

data/test/ruby/standalone/runtime_installer_spec.rb

@@ -1,4 +1,7 @@
+# TODO: move these tests to config/install_standalone_runtime_command_spec.rb
+if false
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+PhusionPassenger.require_passenger_lib 'constants'
 PhusionPassenger.require_passenger_lib 'standalone/runtime_installer'
 require 'tmpdir'
 require 'fileutils'
@@ -53,14 +56,12 @@ describe RuntimeInstaller do
 	end
 
 	def create_dummy_support_binaries
-		Dir.mkdir("agents")
-		["PassengerWatchdog", "PassengerHelperAgent", "PassengerLoggingAgent"].each do |exe|
-			File.open("agents/#{exe}", "w") do |f|
-				f.puts "#!/bin/bash"
-				f.puts "echo PASS"
-			end
-			File.chmod(0755, "agents/#{exe}")
+		Dir.mkdir("support-binaries")
+		File.open("support-binaries/#{AGENT_EXE}", "w") do |f|
+			f.puts "#!/bin/bash"
+			f.puts "echo PASS"
 		end
+		File.chmod(0755, "support-binaries/#{AGENT_EXE}")
 	end
 
 	def create_dummy_nginx_binary
@@ -169,7 +170,7 @@ describe RuntimeInstaller do
 					end
 					true
 				end
-			
+
 			@installer.should_receive(:check_for_download_tool)
 			@installer.should_not_receive(:check_depdendencies)
 			@installer.should_not_receive(:compile_support_binaries)
@@ -177,7 +178,7 @@ describe RuntimeInstaller do
 			@installer.should_not_receive(:compile_nginx)
 			@installer.run
 
-			File.exist?("#{@temp_dir}/support/agents/PassengerWatchdog").should be_true
+			File.exist?("#{@temp_dir}/support/support-binaries/#{AGENT_EXE}").should be_true
 		end
 
 		it "downloads the Nginx binary from the Internet if :nginx is specified as target" do
@@ -215,7 +216,7 @@ describe RuntimeInstaller do
 			@installer.should_not_receive(:compile_nginx)
 			@installer.run
 
-			File.exist?("#{@temp_dir}/support/agents/PassengerWatchdog").should be_true
+			File.exist?("#{@temp_dir}/support/support-binaries/#{AGENT_EXE}").should be_true
 			File.exist?("#{@temp_dir}/nginx/PassengerWebHelper").should be_true
 		end
 
@@ -231,8 +232,8 @@ describe RuntimeInstaller do
 			@installer.should_receive(:run_rake_task!).with(
 				"nginx_without_native_support CACHING=false OUTPUT_DIR='#{@temp_dir}/support'").
 				and_return do
-					FileUtils.mkdir_p("#{@temp_dir}/agents")
-					create_file("#{@temp_dir}/agents/PassengerWatchdog")
+					FileUtils.mkdir_p("#{@temp_dir}/support-binaries")
+					create_file("#{@temp_dir}/support-binaries/#{AGENT_EXE}")
 
 					nginx_libs.each do |object_filename|
 						dir = File.dirname(object_filename)
@@ -363,7 +364,7 @@ describe RuntimeInstaller do
 		lambda { @installer.run }.should raise_error(SystemExit)
 		@logs.string.should =~ %r{Unable to download or extract Nginx source tarball}
 	end
-	
+
 	it "aborts if the Nginx binary cannot be built" do
 		create_installer(:targets => [:nginx],
 			:nginx_dir => "#{@temp_dir}/nginx",
@@ -398,3 +399,4 @@ end
 
 end # module Standalone
 end # module PhusionPassenger
+end

data/test/ruby/union_station_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'stringio'
+require 'tmpdir'
+require 'fileutils'
 PhusionPassenger.require_passenger_lib 'union_station/core'
 
 module PhusionPassenger
@@ -8,33 +10,36 @@ 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"
+		@tmpdir    = Dir.mktmpdir
+		@dump_file =  "#{@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
+		FileUtils.rm_rf(@tmpdir) if @tmpdir
 		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)
+		@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(
+			@tmpdir, @dump_file, @password)
 	end
-	
+
 	def kill_agent
 		if @agent_pid
 			Process.kill('KILL', @agent_pid)
@@ -43,10 +48,10 @@ describe UnionStation::Core do
 			@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
@@ -54,9 +59,9 @@ describe UnionStation::Core do
 		ensure
 			transaction.close(true)
 		end
-		
+
 		File.read(@dump_file).should =~ /hello/
-		
+
 		transaction = @core.new_transaction("foobar", :processes)
 		transaction.should_not be_null
 		begin
@@ -64,49 +69,49 @@ describe UnionStation::Core do
 		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")
@@ -121,48 +126,48 @@ describe UnionStation::Core do
 		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")
@@ -172,30 +177,30 @@ describe UnionStation::Core do
 			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
@@ -204,7 +209,7 @@ describe UnionStation::Core do
 			core.close
 		end
 	end
-	
+
 	specify "#clear_connection closes the connection" do
 		@core.new_transaction("foobar").close
 		@core.clear_connection
@@ -230,7 +235,7 @@ describe UnionStation::Core do
 			ensure
 				logger.close
 			end
-			
+
 			File.exist?("#{@log_dir}/1").should be_false
 		end