passenger 4.0.45 → 4.0.46

metadata.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJTmYzGAAoJECrHRaUKISqMNuEIAJ0KBHgumSlkufhMIDJH0ive
-jSKD7jiWPsi8SyBOl5ohnr9QJMmO3L77WUt8AM7gLy9D0XHBd9FlzktzngEyAEJn
-NnXhDZyTKQLai2qmNFnYa/N8EMfVQ0Hz4e7aqima3DLrUkKVoGhXm//duU3Tjn5b
-rjPp1GKAfUIS7zHSOygQ0nZE+n1RlHpV3D0vKkf+3HYOxBFOGd7lwLb3HNZ7MO4M
-GuW3vmkYWDJnJbw1B5xI3MiHuwdRVY5ekTKBlTuoHkjn44rQyQfN3iDvBg73Pnb3
-3oe+8qru2B7GvvRWveM8/16ey73Z3K49mMhVD1i+tBYnGW8wAN0b1H/SFVDp3fk=
-=Kul/
+iQEcBAABAgAGBQJTxCOxAAoJECrHRaUKISqMXVwIAI0rKA8XrET+UEEZxdg0KApM
+9To5MBumjeAEjNifX89upFHpSw+pXbOGz0xggl8h1y0axsDL8fQuXS7nWKWy4o6u
+FbOBo3BBH9Ji0e6G/LlPe2NbYGxHLGUEmFER1/qXwO4PffdR3+gRnjEJEucs4aPJ
+1qbrne5R3svh2vRFnzJMRHdP8cBYXz1DS/DK4xY0aQ10RK6Ah7C2zrhTBudezqUp
+dXnnDa8Pcc/i0j1v2bZISOYp7nwhs+akf+c9/z3dZBpoIDPN2USt5IMyb5B4/ueT
+SFgRk/kStS95XwIlAb6a+PzDGjEfL/qVxVjQDb2GjgihP7vQEzWMzeTumbZa16g=
+=k1B4
 -----END PGP SIGNATURE-----

data/helper-scripts/wsgi-preloader.py

@@ -1 +0,0 @@
-#!/usr/bin/env python

data/lib/phusion_passenger/standalone/package_runtime_command.rb

@@ -1,105 +0,0 @@
-# encoding: utf-8
-#  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010 Phusion
-#
-#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-module PhusionPassenger
-module Standalone
-
-class PackageRuntimeCommand < Command
-	def self.description
-		return "Package the Phusion Passenger Standalone runtime."
-	end
-
-	def self.require_libs
-		PhusionPassenger.require_passenger_lib 'platform_info/binary_compatibility'
-		PhusionPassenger.require_passenger_lib 'standalone/runtime_installer'
-	end
-
-	def run
-		destdir = File.expand_path("passenger-standalone")
-		description =
-			"Package the Phusion Passenger Standalone runtime into the specified directory.\n" <<
-			"If DIRECTORY is not given then #{destdir} will be used."
-		parse_options!("package [directory]", description) do |opts|
-			opts.separator "Options:"
-			opts.on("--nginx-version VERSION", String,
-				wrap_desc("Nginx version to use as core (default: #{@options[:nginx_version]})")) do |value|
-				@options[:nginx_version] = value
-			end
-			opts.on("--nginx-tarball FILENAME", String,
-				wrap_desc("Use the given tarball instead of downloading from the Internet. " +
-					"This tarball *must* match the version specified by --nginx-version!")) do |value|
-				@options[:nginx_tarball] = value
-			end
-		end
-		
-		destdir     = File.expand_path(@args[0]) if @args[0]
-		runtime_dir = "#{destdir}/#{PhusionPassenger::VERSION_STRING}"
-		support_dir = "#{runtime_dir}/support-#{PlatformInfo.cxx_binary_compatibility_id}"
-		ruby_dir    = "#{runtime_dir}/rubyext-#{PlatformInfo.ruby_extension_binary_compatibility_id}"
-		nginx_dir   = "#{runtime_dir}/nginx-#{@options[:nginx_version]}-#{PlatformInfo.cxx_binary_compatibility_id}"
-		
-		sh "rm", "-rf", support_dir
-		sh "rm", "-rf", nginx_dir
-		
-		installer = RuntimeInstaller.new(
-			:targets     => [:nginx, :ruby, :support_binaries],
-			:support_dir => support_dir,
-			:ruby_dir    => ruby_dir,
-			:nginx_dir   => nginx_dir,
-			:nginx_version     => @options[:nginx_version],
-			:nginx_tarball     => @options[:nginx_tarball],
-			:download_binaries => false)
-		installer.run
-		
-		Dir.chdir(support_dir) do
-			support_dir_name = File.basename(support_dir)
-			puts "cd #{support_dir}"
-			sh "tar -c . | gzip --best > ../#{support_dir_name}.tar.gz"
-		end
-		Dir.chdir(ruby_dir) do
-			ruby_dir_name = File.basename(ruby_dir)
-			puts "cd #{ruby_dir}"
-			sh "tar -c . | gzip --best > ../#{ruby_dir_name}.tar.gz"
-		end
-		Dir.chdir(nginx_dir) do
-			nginx_dir_name   = File.basename(nginx_dir)
-			puts "cd #{nginx_dir}"
-			sh "tar -c . | gzip --best > ../#{nginx_dir_name}.tar.gz"
-		end
-		puts "cd #{runtime_dir}"
-		sh "rm", "-rf", support_dir, ruby_dir, nginx_dir
-	end
-
-private
-	def sh(*args)
-		puts args.join(' ')
-		if !system(*args)
-			STDERR.puts "*** Cannot run command: #{args.join(' ')}"
-			exit 1
-		end
-	end
-end
-
-end
-end

data/test/ruby/analytics_logger_spec.rb

@@ -1,283 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'stringio'
-PhusionPassenger.require_passenger_lib '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)
-	
-	before :each do
-		@username = "logging"
-		@password = "1234"
-		@dump_file = Utils.passenger_tmpdir + "/log.txt"
-		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(@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)
-		
-		log = @logger.new_transaction("foobar")
-		log.should_not be_null
-		begin
-			log.message("hello")
-		ensure
-			log.close(true)
-		end
-		
-		File.read(@dump_file).should =~ /hello/
-		
-		log = @logger.new_transaction("foobar", :processes)
-		log.should_not be_null
-		begin
-			log.message("world")
-		ensure
-			log.close(true)
-		end
-		
-		File.read(@dump_file).should =~ /world/
-	end
-	
-	specify "#new_transaction reestablishes the connection if disconnected" do
-		mock_time(TODAY)
-		
-		@logger.new_transaction("foobar").close(true)
-		connection = @logger.instance_variable_get(:"@connection")
-		connection.synchronize do
-			connection.channel.close
-			connection.channel = nil
-		end
-		
-		log = @logger.new_transaction("foobar")
-		begin
-			log.message("hello")
-		ensure
-			log.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
-		@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
-		
-		File.read(@dump_file).should =~ /#{Regexp.escape log.txn_id} .* hello$/
-		File.read(@dump_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)
-		
-		connection = @logger2.instance_variable_get(:"@connection")
-		connection.synchronize do
-			connection.channel.close
-			connection.channel = nil
-		end
-		
-		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
-		begin
-			log2.message("hello")
-		ensure
-			log2.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)
-		
-		log = @logger.new_transaction("foobar")
-		@logger2.continue_transaction(log.txn_id, "foobar").close
-		kill_agent
-		start_agent
-		
-		log = @logger.new_transaction("foobar")
-		log.should be_null
-		log2 = @logger2.continue_transaction("1234-abcd", "foobar")
-		log2.should be_null
-		
-		mock_time(TODAY + 60)
-		log = @logger.new_transaction("foobar")
-		log2 = @logger2.continue_transaction(log.txn_id, "foobar")
-		begin
-			log2.message("hello")
-		ensure
-			log2.close(true)
-		end
-		log.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
-		@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 "#clear_connection closes the connection" do
-		@logger.new_transaction("foobar").close
-		@logger.clear_connection
-		connection = @logger.instance_variable_get(:"@connection")
-		connection.synchronize do
-			connection.channel.should be_nil
-		end
-	end
-
-	describe "Log objects" do
-		it "becomes null once it is closed" do
-			log = @logger.new_transaction("foobar")
-			log.close
-			log.should be_null
-		end
-
-		it "does nothing if it's null" 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
-
-		describe "#begin_measure" do
-			it "sends a BEGIN message" do
-				log = @logger.new_transaction("foobar")
-				begin
-					log.should_receive(:message).with(/^BEGIN: hello \(.+?,.+?,.+?\) $/)
-					log.begin_measure("hello")
-				ensure
-					log.close
-				end
-			end
-
-			it "adds extra information as base64" do
-				log = @logger.new_transaction("foobar")
-				begin
-					log.should_receive(:message).with(/^BEGIN: hello \(.+?,.+?,.+?\) YWJjZA==$/)
-					log.begin_measure("hello", "abcd")
-				ensure
-					log.close
-				end
-			end
-		end
-
-		describe "#end_measure" do
-			it "sends an END message if error_countered=false" do
-				log = @logger.new_transaction("foobar")
-				begin
-					log.should_receive(:message).with(/^END: hello \(.+?,.+?,.+?\)$/)
-					log.end_measure("hello")
-				ensure
-					log.close
-				end
-			end
-
-			it "sends a FAIL message if error_countered=true" do
-				log = @logger.new_transaction("foobar")
-				begin
-					log.should_receive(:message).with(/^FAIL: hello \(.+?,.+?,.+?\)$/)
-					log.end_measure("hello", true)
-				ensure
-					log.close
-				end
-			end
-		end
-	end
-end
-
-end # module PhusionPassenger