passenger 2.2.15 → 3.0.0.pre1

data/test/ruby/analytics_logger_spec.rb

@@ -0,0 +1,253 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'stringio'
+require 'phusion_passenger/analytics_logger'
+
+module PhusionPassenger
+
+describe AnalyticsLogger 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)
+	FOOBAR_MD5 = Digest::MD5.hexdigest("foobar")
+	LOCALHOST_MD5 = Digest::MD5.hexdigest("localhost")
+	
+	before :each do
+		@username = "logging"
+		@password = "1234"
+		@log_dir  = Utils.passenger_tmpdir
+		start_agent
+		@logger = AnalyticsLogger.new(@socket_address, @username, @password, "localhost")
+		@logger2 = AnalyticsLogger.new(@socket_address, @username, @password, "localhost")
+	end
+	
+	after :each do
+		@logger.close
+		@logger2.close
+		if @agent_pid
+			Process.kill('KILL', @agent_pid)
+			Process.waitpid(@agent_pid)
+		end
+	end
+	
+	def mock_time(time)
+		AnalyticsLogger.stub!(:current_time).and_return(time)
+	end
+	
+	def start_agent
+		@agent_pid, @socket_filename, @socket_address = spawn_logging_agent(@log_dir, @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)
+		
+		log = @logger.new_transaction("foobar")
+		log.should_not be_null
+		begin
+			log.message("hello")
+		ensure
+			log.close(true)
+		end
+		
+		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/requests/2010/04/11/12/log.txt"
+		File.read(log_file).should =~ /hello/
+		
+		log = @logger.new_transaction("foobar", :processes)
+		log.should_not be_null
+		begin
+			log.message("world")
+		ensure
+			log.close(true)
+		end
+		
+		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/processes/2010/04/11/12/log.txt"
+		File.read(log_file).should =~ /world/
+	end
+	
+	specify "#new_transaction reestablishes the connection if disconnected" do
+		mock_time(TODAY)
+		
+		@logger.new_transaction("foobar").close(true)
+		shared_data = @logger.instance_variable_get(:"@shared_data")
+		shared_data.synchronize do
+			shared_data.client.close
+		end
+		
+		log = @logger.new_transaction("foobar")
+		begin
+			log.message("hello")
+		ensure
+			log.close(true)
+		end
+		
+		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/requests/2010/04/11/12/log.txt"
+		File.read(log_file).should =~ /hello/
+	end
+	
+	specify "#new_transaction reestablishes the connection to the logging server if the logging server crashed and was restarted" do
+		mock_time(TODAY)
+		
+		@logger.new_transaction("foobar").close
+		kill_agent
+		start_agent
+		
+		log = @logger.new_transaction("foobar")
+		begin
+			log.message("hello")
+		ensure
+			log.close(true)
+		end
+		
+		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/requests/2010/04/11/12/log.txt"
+		File.read(log_file).should =~ /hello/
+	end
+	
+	specify "#new_transaction does not reconnect to the server for a short period of time if connecting failed" do
+		@logger.reconnect_timeout = 60
+		@logger.max_connect_tries = 1
+		
+		mock_time(TODAY)
+		kill_agent
+		@logger.new_transaction("foobar").should be_null
+		
+		mock_time(TODAY + 30)
+		start_agent
+		@logger.new_transaction("foobar").should be_null
+		
+		mock_time(TODAY + 61)
+		@logger.new_transaction("foobar").should_not be_null
+	end
+	
+	specify "logging with #continue_transaction works" do
+		mock_time(TODAY)
+		
+		log = @logger.new_transaction("foobar", :processes)
+		begin
+			log.message("hello")
+			log2 = @logger2.continue_transaction(log.txn_id, "foobar", :processes)
+			log2.should_not be_null
+			log2.txn_id.should == log.txn_id
+			begin
+				log2.message("world")
+			ensure
+				log2.close(true)
+			end
+		ensure
+			log.close(true)
+		end
+		
+		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/processes/2010/04/11/12/log.txt"
+		File.read(log_file).should =~ /#{Regexp.escape log.txn_id} .* hello$/
+		File.read(log_file).should =~ /#{Regexp.escape log.txn_id} .* world$/
+	end
+	
+	specify "#continue_transaction reestablishes the connection if disconnected" do
+		mock_time(TODAY)
+		
+		log = @logger.new_transaction("foobar")
+		log.close(true)
+		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
+		log2.close(true)
+		
+		shared_data = @logger2.instance_variable_get(:"@shared_data")
+		shared_data.synchronize do
+			shared_data.client.close
+		end
+		
+		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
+		begin
+			log2.message("hello")
+		ensure
+			log2.close(true)
+		end
+		
+		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/requests/2010/04/11/12/log.txt"
+		File.read(log_file).should =~ /hello/
+	end
+	
+	specify "#continue_transaction reestablishes the connection to the logging server if the logging server crashed and was restarted" do
+		mock_time(TODAY)
+		
+		log = @logger.new_transaction("foobar")
+		@logger2.continue_transaction(log.txn_id, "foobar").close
+		kill_agent
+		start_agent
+		
+		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
+		begin
+			log2.message("hello")
+		ensure
+			log2.close(true)
+		end
+		
+		log_file = "#{@log_dir}/1/#{FOOBAR_MD5}/#{LOCALHOST_MD5}/requests/2010/04/11/12/log.txt"
+		File.read(log_file).should =~ /hello/
+	end
+	
+	specify "#continue_transaction does not reconnect to the server for a short period of time if connecting failed" do
+		@logger.reconnect_timeout = 60
+		@logger.max_connect_tries = 1
+		@logger2.reconnect_timeout = 60
+		@logger2.max_connect_tries = 1
+		
+		mock_time(TODAY)
+		log = @logger.new_transaction("foobar")
+		@logger2.continue_transaction(log.txn_id, "foobar")
+		kill_agent
+		@logger2.continue_transaction(log.txn_id, "foobar").should be_null
+		
+		mock_time(TODAY + 30)
+		start_agent
+		@logger2.continue_transaction(log.txn_id, "foobar").should be_null
+		
+		mock_time(TODAY + 61)
+		@logger2.continue_transaction(log.txn_id, "foobar").should_not be_null
+	end
+	
+	specify "AnalyticsLogger only creates null Log objects if no server address is given" do
+		logger = AnalyticsLogger.new(nil, nil, nil, nil)
+		begin
+			logger.new_transaction("foobar").should be_null
+		ensure
+			logger.close
+		end
+	end
+	
+	specify "once a Log object is closed, be becomes null" do
+		log = @logger.new_transaction("foobar")
+		log.close
+		log.should be_null
+	end
+	
+	specify "null Log objects don't do anything" do
+		logger = AnalyticsLogger.new(nil, nil, nil, nil)
+		begin
+			log = logger.new_transaction("foobar")
+			log.message("hello")
+			log.close(true)
+		ensure
+			logger.close
+		end
+		
+		File.exist?("#{@log_dir}/1").should be_false
+	end
+	
+	specify "#clear_connection closes the connection" do
+		@logger.new_transaction("foobar").close
+		@logger.clear_connection
+		shared_data = @logger.instance_variable_get(:"@shared_data")
+		shared_data.synchronize do
+			shared_data.client.should be_nil
+		end
+	end
+end
+
+end # module PhusionPassenger

data/test/ruby/{application_spec.rb → app_process_spec.rb}

@@ -1,27 +1,25 @@
-require 'support/config'
-require 'support/test_helper'
-require 'phusion_passenger/application'
-include PhusionPassenger
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'phusion_passenger/app_process'
 
-describe Application do
-	include TestHelper
-	
+module PhusionPassenger
+
+describe AppProcess do
 	before :each do
-		@stub = setup_rails_stub('foobar')
+		@stub = RailsStub.new('2.3/foobar')
 	end
 	
 	after :each do
-		teardown_rails_stub
+		@stub.destroy
 	end
 	
 	it "correctly detects Rails version numbers specified in environment.rb" do
-		rails_version = Application.detect_framework_version(@stub.app_root)
-		rails_version.should =~ /^2\.0\.(\d+)$/
+		rails_version = AppProcess.detect_framework_version(@stub.app_root)
+		rails_version.should =~ /^2\.3\.(\d+)$/
 	end
 	
 	it "returns :vendor if an application uses a vendored Rails" do
 		@stub.use_vendor_rails('minimal')
-		rails_version = Application.detect_framework_version(@stub.app_root)
+		rails_version = AppProcess.detect_framework_version(@stub.app_root)
 		rails_version.should == :vendor
 	end
 	
@@ -29,7 +27,7 @@ describe Application do
 		File.write(@stub.environment_rb) do |content|
 			content.sub(/^RAILS_GEM_VERSION = .*$/, '')
 		end
-		rails_version = Application.detect_framework_version(@stub.app_root)
+		rails_version = AppProcess.detect_framework_version(@stub.app_root)
 		rails_version.should be_nil
 	end
 	
@@ -37,7 +35,9 @@ describe Application do
 		File.write(@stub.environment_rb) do |content|
 			content.sub(/^RAILS_GEM_VERSION = .*$/, "RAILS_GEM_VERSION = '1.9.1972'")
 		end
-		detector = lambda { Application.detect_framework_version(@stub.app_root) }
+		detector = lambda { AppProcess.detect_framework_version(@stub.app_root) }
 		detector.should raise_error(::PhusionPassenger::VersionNotFound)
 	end
 end
+
+end # module PhusionPassenger

data/test/ruby/classic_rails/application_spawner_spec.rb

@@ -0,0 +1,89 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'phusion_passenger/classic_rails/application_spawner'
+
+require 'ruby/shared/abstract_server_spec'
+require 'ruby/shared/spawners/spawn_server_spec'
+require 'ruby/shared/spawners/spawner_spec'
+require 'ruby/shared/spawners/preloading_spawner_spec'
+require 'ruby/shared/spawners/non_preloading_spawner_spec'
+require 'ruby/shared/spawners/classic_rails/spawner_spec'
+require 'ruby/shared/spawners/classic_rails/lack_of_rails_gem_version_spec'
+require 'ruby/shared/rails/analytics_logging_extensions_spec'
+
+module PhusionPassenger
+
+describe ClassicRails::ApplicationSpawner do
+	include SpawnerSpecHelper
+	
+	after :each do
+		@spawner.stop if @spawner && @spawner.started?
+	end
+	
+	describe "conservative spawning" do
+		def spawn_some_application(extra_options = {})
+			stub = register_stub(RailsStub.new("#{rails_version}/empty"))
+			yield stub if block_given?
+			
+			default_options = {
+				"app_root"     => stub.app_root,
+				"default_user" => CONFIG['default_user']
+			}
+			options = default_options.merge(extra_options)
+			app = ClassicRails::ApplicationSpawner.spawn_application(options)
+			return register_app(app)
+		end
+		
+		describe_rails_versions('<= 2.3') do
+			it_should_behave_like "a spawner"
+			it_should_behave_like "a spawner that does not preload app code"
+			it_should_behave_like "a Rails spawner"
+			include_shared_example_group "a Rails app that lacks RAILS_GEM_VERSION"
+			include_shared_example_group "analytics logging extensions for Rails"
+		end
+	end
+	
+	describe "smart spawning" do
+		def server
+			return spawner
+		end
+		
+		def spawner
+			@spawner ||= begin
+				stub = register_stub(RailsStub.new("#{rails_version}/empty"))
+				spawner = ClassicRails::ApplicationSpawner.new("app_root" => stub.app_root)
+				spawner.start
+				spawner
+			end
+		end
+		
+		def spawn_some_application(extra_options = {})
+			stub = register_stub(RailsStub.new("#{rails_version}/empty"))
+			yield stub if block_given?
+			
+			default_options = {
+				"app_root"     => stub.app_root,
+				"default_user" => CONFIG['default_user']
+			}
+			options = default_options.merge(extra_options)
+			@spawner ||= begin
+				spawner = ClassicRails::ApplicationSpawner.new(options)
+				spawner.start
+				spawner
+			end
+			app = @spawner.spawn_application(options)
+			return register_app(app)
+		end
+		
+		describe_rails_versions('<= 2.3') do
+			it_should_behave_like "an AbstractServer"
+			it_should_behave_like "a spawn server"
+			it_should_behave_like "a spawner"
+			it_should_behave_like "a spawner that preloads app code"
+			it_should_behave_like "a Rails spawner"
+			include_shared_example_group "a Rails app that lacks RAILS_GEM_VERSION"
+			include_shared_example_group "analytics logging extensions for Rails"
+		end
+	end
+end
+
+end # module PhusionPassenger

data/test/ruby/classic_rails/framework_spawner_spec.rb

@@ -0,0 +1,92 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'phusion_passenger/app_process'
+require 'phusion_passenger/classic_rails/framework_spawner'
+
+require 'ruby/shared/abstract_server_spec'
+require 'ruby/shared/spawners/spawn_server_spec'
+require 'ruby/shared/spawners/spawner_spec'
+require 'ruby/shared/spawners/reload_single_spec'
+require 'ruby/shared/spawners/reload_all_spec'
+require 'ruby/shared/spawners/classic_rails/spawner_spec'
+require 'ruby/shared/spawners/classic_rails/framework_spawner_spec'
+
+# TODO: test whether FrameworkSpawner restarts ApplicationSpawner if it crashed
+
+module PhusionPassenger
+
+describe ClassicRails::FrameworkSpawner do
+	include SpawnerSpecHelper
+	
+	after :each do
+		@spawner.stop if @spawner && @spawner.started?
+	end
+	
+	def server
+		return spawner
+	end
+	
+	def spawner
+		@spawner ||= begin
+			stub = register_stub(RailsStub.new("#{rails_version}/empty"))
+			yield stub if block_given?
+			
+			framework_version = AppProcess.detect_framework_version(stub.app_root)
+			spawner = ClassicRails::ApplicationSpawner.new(
+				"framework_version" => framework_version,
+				"app_root" => stub.app_root)
+			spawner.start
+			spawner
+		end
+	end
+	
+	def spawn_stub_application(stub, extra_options = {})
+		framework_version = AppProcess.detect_framework_version(stub.app_root)
+		default_options = {
+			"framework_version" => framework_version,
+			"app_root"     => stub.app_root,
+			"default_user" => CONFIG['default_user']
+		}
+		options = default_options.merge(extra_options)
+		@spawner ||= begin
+			spawner = ClassicRails::FrameworkSpawner.new(options)
+			spawner.start
+			spawner
+		end
+		app = @spawner.spawn_application(options)
+		return register_app(app)
+	end
+	
+	def spawn_some_application(extra_options = {})
+		stub = register_stub(RailsStub.new("#{rails_version}/empty"))
+		yield stub if block_given?
+		return spawn_stub_application(stub, extra_options)
+	end
+	
+	def use_some_stub
+		RailsStub.use("#{rails_version}/empty") do |stub|
+			yield stub
+		end
+	end
+	
+	def load_nonexistant_framework(options = {})
+		spawner = ClassicRails::FrameworkSpawner.new(options.merge(
+			"framework_version" => "1.9.827"))
+		begin
+			spawner.start
+		ensure
+			spawner.stop rescue nil
+		end
+	end
+	
+	describe_rails_versions('<= 2.3') do
+		it_should_behave_like "an AbstractServer"
+		it_should_behave_like "a spawn server"
+		it_should_behave_like "a spawner"
+		it_should_behave_like "a Rails spawner"
+		it_should_behave_like "a ClassicRails::FrameworkSpawner"
+		it_should_behave_like "a Rails spawner that supports #reload(app_group_name)"
+		it_should_behave_like "a Rails spawner that supports #reload()"
+	end
+end
+
+end # module PhusionPassenger