passenger 1.0.1 → 1.0.2

data/LICENSE

@@ -7,7 +7,9 @@ of the application's own licensing terms. The application will not be bound to
 the terms of the GPL in any way. That is, the GPL only applies to Passenger
 itself, and not to applications that are run through Passenger.
 
-We also explicitly allow Apache to load the Passenger Apache module.
+We also explicitly allow Apache to load the Passenger Apache module, without
+Apache or any other loaded modules needing to be released under the terms of
+the GPL.
 
 ----------------------------------------------------------------------
 

data/Rakefile

@@ -27,13 +27,13 @@ require 'passenger/platform_info'
 ##### Configuration
 
 # Don't forget to edit Configuration.h too
-PACKAGE_VERSION = "1.0.1"
+PACKAGE_VERSION = "1.0.2"
 
 include PlatformInfo
 APXS2.nil? and raise "Could not find 'apxs' or 'apxs2'."
 APACHE2CTL.nil? and raise "Could not find 'apachectl' or 'apache2ctl'."
 HTTPD.nil? and raise "Could not find the Apache web server binary."
-APR1_FLAGS.nil? and raise "Could not find Apache Portable Runtime (APR)."
+APR_FLAGS.nil? and raise "Could not find Apache Portable Runtime (APR)."
 
 CXX = "g++"
 THREADING_FLAGS = "-D_REENTRANT"
@@ -101,7 +101,7 @@ end
 ##### Apache module
 
 class APACHE2
-	CXXFLAGS = CXXFLAGS + " -fPIC -g -DPASSENGER_DEBUG #{APR1_FLAGS} #{APXS2_FLAGS} -I.."
+	CXXFLAGS = "-I.. -fPIC -g -DPASSENGER_DEBUG #{APR_FLAGS} #{APXS2_FLAGS} #{CXXFLAGS}"
 	OBJECTS = {
 		'Configuration.o' => %w(Configuration.cpp Configuration.h),
 		'Hooks.o' => %w(Hooks.cpp Hooks.h
@@ -128,7 +128,7 @@ subdir 'ext/apache2' do
 		#
 		# Oh, and libtool sucks too. Do we even need it anymore in 2008?
 		linkflags = "#{LDFLAGS} #{MULTI_ARCH_FLAGS}"
-		linkflags << " -lstdc++ -lpthread ../boost/src/libboost_thread.a #{APR1_LIBS}"
+		linkflags << " -lstdc++ -lpthread ../boost/src/libboost_thread.a #{APR_LIBS}"
 		create_shared_library 'mod_passenger.so',
 			APACHE2::OBJECTS.keys.join(' ') << ' mod_passenger.o',
 			linkflags
@@ -179,7 +179,7 @@ end
 
 class TEST
 	CXXFLAGS = ::CXXFLAGS + " -Isupport -DTESTING_SPAWN_MANAGER -DTESTING_APPLICATION_POOL "
-	AP2_FLAGS = "-I../ext/apache2 -I../ext #{APR1_FLAGS}"
+	AP2_FLAGS = "-I../ext/apache2 -I../ext #{APR_FLAGS}"
 	
 	AP2_OBJECTS = {
 		'CxxTestMain.o' => %w(CxxTestMain.cpp),
@@ -239,12 +239,13 @@ subdir 'test' do
 			" ../ext/apache2/Utils.o" <<
 			" ../ext/apache2/Logging.o"
 		create_executable "Apache2ModuleTests", objects,
-			"#{LDFLAGS} #{APR1_LIBS} ../ext/boost/src/libboost_thread.a -lpthread"
+			"#{LDFLAGS} #{APR_LIBS} #{MULTI_ARCH_FLAGS} " <<
+			"../ext/boost/src/libboost_thread.a -lpthread"
 	end
 	
 	TEST::AP2_OBJECTS.each_pair do |target, sources|
 		file target => sources do
-			compile_cxx sources[0], TEST::CXXFLAGS + " " + TEST::AP2_FLAGS
+			compile_cxx sources[0], "#{TEST::AP2_FLAGS} #{TEST::CXXFLAGS}"
 		end
 	end
 	
@@ -272,7 +273,7 @@ subdir 'benchmark' do
 	file 'DummyRequestHandler' => ['DummyRequestHandler.cpp',
 	  '../ext/apache2/MessageChannel.h'] do
 		create_executable "DummyRequestHandler", "DummyRequestHandler.cpp",
-			"#{CXXFLAGS} -I../ext -I../ext/apache2 #{LDFLAGS}"
+			"-I../ext -I../ext/apache2 #{CXXFLAGS} #{LDFLAGS}"
 	end
 	
 	task :clean do
@@ -333,7 +334,7 @@ end
 
 spec = Gem::Specification.new do |s|
 	s.platform = Gem::Platform::RUBY
-	s.homepage = "http://passenger.phusion.nl/"
+	s.homepage = "http://www.modrails.com/"
 	s.summary = "Apache module for Ruby on Rails support."
 	s.name = "passenger"
 	s.version = PACKAGE_VERSION
@@ -344,8 +345,6 @@ spec = Gem::Specification.new do |s|
 	s.require_path = "lib"
 	s.add_dependency 'rake', '>= 0.8.1'
 	s.add_dependency 'fastthread', '>= 1.0.1'
-	s.add_dependency 'rspec', '>= 1.1.2'
-	s.add_dependency 'rails', '>= 1.2.0'
 	s.extensions << 'ext/passenger/extconf.rb'
 	s.files = FileList[
 		'Rakefile',
@@ -380,7 +379,13 @@ spec = Gem::Specification.new do |s|
 	] - Dir['test/stub/*/log/*'] \
 	  - Dir['test/stub/*/tmp/*/*'] \
 	  - Dir['test/stub/apache2/*.{pid,lock,log}']
-	s.executables = ['passenger-spawn-server', 'passenger-install-apache2-module']
+	s.executables = [
+		'passenger-spawn-server',
+		'passenger-install-apache2-module',
+		'passenger-config',
+		'passenger-memory-stats',
+		'passenger-make-enterprisey'
+	]
 	s.has_rdoc = true
 	s.extra_rdoc_files = ['README']
 	s.rdoc_options <<

data/bin/passenger-config

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+
+def help
+	puts "Tool for showing Passenger configuration information."
+	puts "Usage: passenger-config <OPTIONS>"
+	puts
+	puts "Options:"
+	puts "  --root      Show Passenger's root directory."
+	puts "  --version   Show Passenger's version number."
+end
+
+case ARGV[0]
+when "--root"
+	puts PASSENGER_ROOT
+when "--version"
+	File.read("#{PASSENGER_ROOT}/Rakefile") =~ /^PACKAGE_VERSION = "(.*)"/
+	puts $1
+else
+	help
+	exit 1
+end

data/bin/passenger-install-apache2-module

@@ -27,10 +27,11 @@ ENV["PATH"] += ":/usr/sbin:/sbin:/usr/local/sbin"
 require 'passenger/platform_info'
 require 'passenger/dependencies'
 require 'passenger/console_text_template'
-include Passenger
 include PlatformInfo
 
 class Installer
+	include Passenger
+	
 	PASSENGER_WEBSITE = "http://www.modrails.com/"
 	PHUSION_WEBSITE = "www.phusion.nl"
 	USERS_GUIDE = "#{PASSENGER_ROOT}/doc/Users guide.html"
@@ -51,10 +52,8 @@ class Installer
 		Dir.chdir(PASSENGER_ROOT)
 		show_welcome_screen
 		check_dependencies || exit(1)
-		warn_about_broken_apache_on_osx
 		check_whether_apache_uses_prefork_mpm
 		check_write_permission_to_passenger_root || exit(1)
-		check_write_permission_to_apache_modules_dir || exit(1)
 		if install_apache2_module
 			show_apache2_config_snippets
 			show_deployment_example
@@ -121,13 +120,6 @@ private
 		end
 	end
 	
-	def warn_about_broken_apache_on_osx
-		return unless RUBY_PLATFORM =~ /darwin/ && APXS2 == "/usr/sbin/apxs"
-		line
-		render_template 'osx_broken_apache_warning'
-		wait
-	end
-	
 	def check_whether_apache_uses_prefork_mpm
 		line
 		# 'httpd -V' output is in the form of:
@@ -171,27 +163,6 @@ private
 		File.unlink("__test__.txt") rescue nil
 	end
 	
-	def check_write_permission_to_apache_modules_dir
-		install_dir = `#{APXS2} -q LIBEXECDIR`.strip
-		begin
-			File.new("#{install_dir}/__test__.txt", "w").close
-			return true
-		rescue
-			puts
-			line
-			if Process.uid == 0
-				render_template 'no_write_permission_to_passenger_root',
-					:path => install_dir
-			else
-				render_template 'run_installer_as_root',
-					:path => install_dir
-			end
-			return false
-		ensure
-			File.unlink("#{install_dir}/__test__.txt") rescue nil
-		end
-	end
-	
 	def install_apache2_module
 		puts
 		line

data/bin/passenger-make-enterprisey

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+#  Phusion Passenger - http://www.modrails.com/
+#  Copyright (C) 2008  Phusion
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; version 2 of the License.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+PASSENGER_ROOT = File.expand_path(File.dirname(__FILE__) << "/..")
+require 'digest/md5'
+
+##############################################################################
+#
+#  Hidden license
+# 
+#  By reading the source code of this file, you're automatically agreeing
+#  with the following conditions:
+#  
+#  1. You will sell your soul to us for $0.
+#  2. You will watch the movie "Hot Fuzz".
+#  
+#  [ Allow ]    or    [ Deny ]
+#  
+##############################################################################
+
+
+
+
+trap("INT") { exit 1 }
+if File.exist?("#{PASSENGER_ROOT}/enterprisey.txt")
+	puts "Congratulations, your Passenger Enterprise License has already been activated!"
+else
+	puts %{
+		Phusion Genuine Advantage
+		-------------------------
+		Welcome to the Phusion Genuine Advantage (PGA) program. This program will help
+		you with activating your Passenger Enterprise License.
+		
+		Please enter your Enterprise License Key:
+	}.gsub(/^\t\t/, '').strip
+	done = false
+	while !done
+		key = STDIN.readline.strip
+		if key == Digest::MD5.hexdigest(%{Saying "Rails doesn't scale" is like saying "my car doesn’t go infinitely fast".})
+			done = true
+		else
+			STDERR.puts "Invalid key given. Please try again:"
+		end
+	end
+	if system("touch", "#{PASSENGER_ROOT}/enterprisey.txt")
+		puts "Congratulations! Your Passenger Enterprise License has been activated!"
+		puts "Please restart Apache to take full advantage of your Enterprise License."
+	else
+		STDERR.puts "Could not write to the Passenger folder. Please run this tool as root."
+		exit 1
+	end
+end

data/bin/passenger-memory-stats

@@ -0,0 +1,192 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")
+require 'passenger/platform_info'
+
+# Container for tabular data.
+class Table
+	def initialize(column_names)
+		@column_names = column_names
+		@rows = []
+	end
+	
+	def add_row(values)
+		@rows << values.to_a
+	end
+	
+	def add_rows(list_of_rows)
+		list_of_rows.each do |row|
+			add_row(row)
+		end
+	end
+	
+	def remove_column(name)
+		i = @column_names.index(name)
+		@column_names.delete_at(i)
+		@rows.each do |row|
+			row.delete_at(i)
+		end
+	end
+	
+	def to_s(title = nil)
+		max_column_widths = [1] * @column_names.size
+		(@rows + [@column_names]).each do |row|
+			row.each_with_index do |value, i|
+				max_column_widths[i] = [value.to_s.size, max_column_widths[i]].max
+			end
+		end
+		
+		format_string = max_column_widths.map{ |i| "%-#{i}s" }.join("  ")
+		header = sprintf(format_string, *@column_names).rstrip << "\n"
+		if title
+			free_space = header.size - title.size - 2
+			if free_space <= 0
+				left_bar_size = 3
+				right_bar_size = 3
+			else
+				left_bar_size = free_space / 2
+				right_bar_size = free_space - left_bar_size
+			end
+			result = "#{"-" * left_bar_size} #{title} #{"-" * right_bar_size}\n"
+			result << header
+		else
+			result = header.dup
+		end
+		result << ("-" * header.size) << "\n"
+		@rows.each do |row|
+			result << sprintf(format_string, *row).rstrip << "\n"
+		end
+		result
+	end
+end
+
+class MemoryStats
+	class Process
+		attr_accessor :pid
+		attr_accessor :ppid
+		attr_accessor :threads
+		attr_accessor :vm_size              # in KB
+		attr_accessor :name
+		attr_accessor :private_dirty_rss    # in KB
+		
+		def vm_size_in_mb
+			return sprintf("%.1f MB", vm_size / 1024.0)
+		end
+		
+		def private_dirty_rss_in_mb
+			if private_dirty_rss.is_a?(Numeric)
+				return sprintf("%.1f MB", private_dirty_rss / 1024.0)
+			else
+				return "?"
+			end
+		end
+		
+		def to_a
+			return [pid, ppid, threads, vm_size_in_mb, private_dirty_rss_in_mb, name]
+		end
+	end
+	
+	def start
+		apache_processes = list_processes(:exe => PlatformInfo::HTTPD)
+		print_process_list("Apache processes", apache_processes)
+		
+		puts
+		passenger_processes = list_processes(:match => /(^Passenger |^Rails:|ApplicationPoolServerExecutable)/)
+		print_process_list("Passenger processes", passenger_processes, :show_ppid => false)
+		
+		if RUBY_PLATFORM !~ /linux/
+			puts
+			puts "*** WARNING: The private dirty RSS can only be displayed " <<
+				"on Linux. You're currently using '#{RUBY_PLATFORM}'."
+		elsif ::Process.uid != 0 && (apache_processes + passenger_processes).any?{ |p| p.private_dirty_rss.nil? }
+			puts
+			puts "*** WARNING: Please run this tool as root. Otherwise the " <<
+				"private dirty RSS of processes cannot be determined."
+		end
+	end
+	
+	# Returns a list of Process objects that match the given search criteria.
+	#
+	#  # Search by executable path.
+	#  list_processes(:exe => '/usr/sbin/apache2')
+	#  
+	#  # Search by executable name.
+	#  list_processes(:name => 'ruby1.8')
+	#  
+	#  # Search by process name.
+	#  list_processes(:match => 'Passenger FrameworkSpawner')
+	def list_processes(options)
+		if options[:exe]
+			name = options[:exe].sub(/.*\/(.*)/, '\1')
+			ps = "ps -C '#{name}'"
+		elsif options[:name]
+			ps = "ps -C '#{options[:name]}'"
+		elsif options[:match]
+			ps = "ps -A"
+		else
+			raise ArgumentError, "Invalid options."
+		end
+		
+		processes = []
+		list = `#{ps} -o pid,ppid,nlwp,vsz,command`.split("\n")
+		list.shift
+		list.each do |line|
+			line.gsub!(/^ */, '')
+			line.gsub!(/ *$/, '')
+			
+			p = Process.new
+			p.pid, p.ppid, p.threads, p.vm_size, p.name = line.split(/ +/, 5)
+			if p.name !~ /^ps/ && (!options[:match] || p.name.match(options[:match]))
+				[:pid, :ppid, :threads, :vm_size].each do |attr|
+					p.send("#{attr}=", p.send(attr).to_i)
+				end
+				p.private_dirty_rss = determine_private_dirty_rss(p.pid)
+				processes << p
+			end
+		end
+		return processes
+	end
+
+private
+	# Returns the private dirty RSS for the given process, in KB.
+	def determine_private_dirty_rss(pid)
+		total = 0
+		File.read("/proc/#{pid}/smaps").split("\n").each do |line|
+			line =~ /^(Private)_Dirty: +(\d+)/
+			if $2
+				total += $2.to_i
+			end
+		end
+		return total
+	rescue Errno::EACCES, Errno::ENOENT
+		return nil
+	end
+	
+	def print_process_list(title, processes, options = {})
+		table = Table.new(%w{PID PPID Threads VMSize Private Name})
+		table.add_rows(processes)
+		if options.has_key?(:show_ppid) && !options[:show_ppid]
+			table.remove_column('PPID')
+		end
+		puts table.to_s(title)
+		
+		total_private_dirty_rss = 0
+		some_private_dirty_rss_cannot_be_determined = false
+		processes.each do |p|
+			if p.private_dirty_rss.is_a?(Numeric)
+				total_private_dirty_rss += p.private_dirty_rss
+			else
+				some_private_dirty_rss_cannot_be_determined = true
+			end
+		end
+		puts   "### Processes: #{processes.size}"
+		printf "### Total private dirty RSS: %.2f MB", total_private_dirty_rss / 1024.0
+		if some_private_dirty_rss_cannot_be_determined
+			puts " (?)"
+		else
+			puts
+		end
+	end
+end
+
+MemoryStats.new.start
+