passenger 3.0.5 → 3.0.6

data/ext/common/Utils.cpp

@@ -639,11 +639,35 @@ prestartWebApps(const ResourceLocator &locator, const string &serializedprestart
 	}
 }
 
+void
+runAndPrintExceptions(const function<void ()> &func, bool toAbort) {
+	try {
+		func();
+	} catch (const boost::thread_interrupted &) {
+		throw;
+	} catch (const tracable_exception &e) {
+		P_ERROR("Exception: " << e.what() << "\n" << e.backtrace());
+		if (toAbort) {
+			abort();
+		}
+	}
+}
+
+void
+runAndPrintExceptions(const function<void ()> &func) {
+	runAndPrintExceptions(func, true);
+}
+
 string
 getHostName() {
-	char hostname[HOST_NAME_MAX + 1];
-	if (gethostname(hostname, sizeof(hostname)) == 0) {
-		hostname[sizeof(hostname) - 1] = '\0';
+	long hostNameMax = HOST_NAME_MAX;
+	if (hostNameMax < 255) {
+		// https://bugzilla.redhat.com/show_bug.cgi?id=130733
+		hostNameMax = 255;
+	}
+	char hostname[hostNameMax + 1];
+	if (gethostname(hostname, hostNameMax) == 0) {
+		hostname[hostNameMax] = '\0';
 		return hostname;
 	} else {
 		int e = errno;

data/ext/common/Utils.h

@@ -26,6 +26,7 @@
 #define _PASSENGER_UTILS_H_
 
 #include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string>
@@ -344,6 +345,15 @@ bool verifyWSGIDir(const string &dir, CachedFileStat *cstat = 0,
 
 void prestartWebApps(const ResourceLocator &locator, const string &serializedprestartURLs);
 
+/**
+ * Runs the given function and catches any tracable_exceptions. Upon catching such an exception,
+ * its message and backtrace will be printed. If toAbort is true then it will call abort(),
+ * otherwise the exception is swallowed.
+ * thread_interrupted and all other exceptions are silently propagated.
+ */
+void runAndPrintExceptions(const function<void ()> &func, bool toAbort);
+void runAndPrintExceptions(const function<void ()> &func);
+
 /**
  * Returns the system's host name.
  *

data/ext/common/Watchdog.cpp

@@ -112,6 +112,18 @@ private:
 					pid = start();
 				}
 				ret = syscalls::waitpid(pid, &status, 0);
+				if (ret == -1 && errno == ECHILD) {
+					/* If the agent is attached to gdb then waitpid()
+					 * here can return -1 with errno == ECHILD.
+					 * Fallback to kill() polling for checking
+					 * whether the agent is alive.
+					 */
+					ret = pid;
+					status = 0;
+					P_WARN("waitpid() on " << name() << " return -1 with " <<
+						"errno = ECHILD, falling back to kill polling");
+					waitpidUsingKillPolling(pid);
+				}
 				
 				lock.lock();
 				this->pid = 0;
@@ -120,8 +132,10 @@ private:
 				this_thread::disable_interruption di;
 				this_thread::disable_syscall_interruption dsi;
 				if (ret == -1) {
+					int e = errno;
 					P_WARN(name() << " crashed or killed for "
-						"an unknown reason, restarting it...");
+						"an unknown reason (errno = " <<
+						strerror(e) << "), restarting it...");
 				} else if (WIFEXITED(status)) {
 					if (WEXITSTATUS(status) == 0) {
 						/* When the web server is gracefully exiting, it will
@@ -244,6 +258,18 @@ protected:
 		return 0; // timed out
 	}
 	
+	static void waitpidUsingKillPolling(pid_t pid) {
+		bool done = false;
+		
+		while (!done) {
+			int ret = syscalls::kill(pid, 0);
+			done = ret == -1;
+			if (!done) {
+				syscalls::usleep(20000);
+			}
+		}
+	}
+	
 public:
 	AgentWatcher() {
 		thr = NULL;

data/ext/nginx/HelperAgent.cpp

@@ -522,7 +522,7 @@ private:
 					session->getConnectPassword().size() + 1);
 				end += session->getConnectPassword().size() + 1;
 				
-				if (useUnionStation) {
+				if (!log->isNull()) {
 					memcpy(end, "PASSENGER_GROUP_NAME", sizeof("PASSENGER_GROUP_NAME"));
 					end += sizeof("PASSENGER_GROUP_NAME");
 					
@@ -606,10 +606,6 @@ private:
 				<< "   exception: " << e.what() << "\n"
 				<< "   backtrace:\n" << e.backtrace());
 			abort();
-		} catch (const std::exception &e) {
-			P_ERROR("Uncaught exception in PassengerServer client thread:\n"
-				<< "   exception: " << e.what() << "\n"
-				<< "   backtrace: not available");
 		}
 	}
 	
@@ -638,7 +634,7 @@ public:
 		this->serverSocket = serverSocket;
 		this->analyticsLogger = logger;
 		thr = new oxt::thread(
-			bind(&Client::threadMain, this),
+			boost::bind(&Client::threadMain, this),
 			"Client thread " + toString(number),
 			CLIENT_THREAD_STACK_SIZE
 		);
@@ -864,8 +860,11 @@ public:
 			messageServer->getSocketFilename().c_str(),
 			NULL);
 		
+		function<void ()> func = boost::bind(prestartWebApps,
+			resourceLocator,
+			options.get("prestart_urls"));
 		prestarterThread = ptr(new oxt::thread(
-			boost::bind(prestartWebApps, resourceLocator, options.get("prestart_urls"))
+			boost::bind(runAndPrintExceptions, func, true)
 		));
 	}
 	
@@ -897,8 +896,9 @@ public:
 		TRACE_POINT();
 		
 		startClientHandlerThreads();
+		function<void ()> func = boost::bind(&MessageServer::mainLoop, messageServer.get());
 		messageServerThread = ptr(new oxt::thread(
-			boost::bind(&MessageServer::mainLoop, messageServer.get()),
+			boost::bind(runAndPrintExceptions, func, true),
 			"MessageServer thread", MESSAGE_SERVER_THREAD_STACK_SIZE
 		));
 		

data/ext/oxt/thread.hpp

@@ -83,7 +83,7 @@ private:
 		#endif
 	}
 	
-	static void thread_main(boost::function<void ()> func, thread_data_ptr data) {
+	static void thread_main(const boost::function<void ()> func, thread_data_ptr data) {
 		#ifdef OXT_BACKTRACE_IS_ENABLED
 			initialize_backtrace_support_for_this_thread i(data->name);
 			data->registration = i.registration;
@@ -129,7 +129,7 @@ public:
 	 * @throws boost::thread_resource_error Something went wrong during
 	 *     creation of the thread.
 	 */
-	explicit thread(boost::function<void ()> func, const std::string &name = "", unsigned int stack_size = 0) {
+	explicit thread(const boost::function<void ()> func, const std::string &name = "", unsigned int stack_size = 0) {
 		initialize_data(name);
 		
 		set_thread_main_function(boost::bind(thread_main, func, data));

data/lib/phusion_passenger.rb

@@ -25,7 +25,7 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.5'
+	VERSION_STRING = '3.0.6'
 	
 	PREFERRED_NGINX_VERSION = '0.8.54'
 	PREFERRED_PCRE_VERSION  = '8.10'

data/lib/phusion_passenger/abstract_installer.rb

@@ -61,6 +61,12 @@ class AbstractInstaller
 	def start
 		before_install
 		install!
+	rescue PlatformInfo::RuntimeError => e
+		new_screen
+		color_puts "<red>An error occurred</red>"
+		puts
+		puts e.message
+		exit 1
 	ensure
 		after_install
 	end

data/lib/phusion_passenger/abstract_request_handler.rb

@@ -683,7 +683,8 @@ private
 	
 	def finalize_request(headers, has_error)
 		log = headers[PASSENGER_ANALYTICS_WEB_LOG]
-		if log
+		if log && !log.closed?
+			exception_occurred = false
 			begin
 				log.end_measure("app request handler processing", has_error)
 				if OBJECT_SPACE_SUPPORTS_LIVE_OBJECTS
@@ -703,15 +704,25 @@ private
 					GC.clear_stats
 				end
 				Thread.current[PASSENGER_ANALYTICS_WEB_LOG] = nil
+			rescue Exception
+				# Maybe this exception was raised while communicating
+				# with the logging agent. If that is the case then
+				# log.close may also raise an exception, but we're only
+				# interested in the original exception. So if this
+				# situation occurs we must ignore any exceptions raised
+				# by log.close.
+				exception_occurred = true
+				raise
 			ensure
 				# It is important that the following call receives an ACK
-				# from the logging server and that we don't close the socket
+				# from the logging agent and that we don't close the socket
 				# connection until the ACK has been received, otherwise
 				# the helper agent may close the transaction before this
 				# process's openTransaction command is processed.
 				begin
 					log.close
 				rescue
+					raise if !exception_occurred
 				end
 			end
 		end

data/lib/phusion_passenger/analytics_logger.rb

@@ -85,9 +85,10 @@ class AnalyticsLogger
 				yield
 			rescue Exception
 				error = true
+				is_closed = closed?
 				raise
 			ensure
-				end_measure(name, error)
+				end_measure(name, error) if !is_closed
 			end
 		end
 		
@@ -125,6 +126,16 @@ class AnalyticsLogger
 				@shared_data = nil
 			end if @shared_data
 		end
+		
+		def closed?
+			if @shared_data
+				@shared_data.synchronize do
+					return !@shared_data.client.connected?
+				end
+			else
+				return nil
+			end
+		end
 	
 	private
 		def current_timestamp
@@ -168,7 +179,7 @@ class AnalyticsLogger
 		else
 			@max_connect_tries = 1
 		end
-		@reconnect_timeout = 60
+		@reconnect_timeout = 1
 		@next_reconnect_time = Time.utc(1980, 1, 1)
 	end
 	
@@ -234,7 +245,7 @@ class AnalyticsLogger
 				end
 				# Failed to connect.
 				DebugLogging.warn("Cannot connect to the logging agent (#{@server_address}); " +
-					"retrying in #{@reconnect_timeout} seconds.")
+					"retrying in #{@reconnect_timeout} second(s).")
 				@next_reconnect_time = current_time + @reconnect_timeout
 			end
 			return Log.new
@@ -277,7 +288,7 @@ class AnalyticsLogger
 				end
 				# Failed to connect.
 				DebugLogging.warn("Cannot connect to the logging agent (#{@server_address}); " +
-					"retrying in #{@reconnect_timeout} seconds.")
+					"retrying in #{@reconnect_timeout} second(s).")
 				@next_reconnect_time = current_time + @reconnect_timeout
 			end
 			return Log.new

data/lib/phusion_passenger/dependencies.rb

@@ -452,8 +452,8 @@ module Dependencies # :nodoc: all
 	Curl_Dev = Dependency.new do |dep|
 		dep.name = "Curl development headers with SSL support"
 		dep.define_checker do |result|
-			source_file = '/tmp/passenger-curl-check.c'
-			output_file = '/tmp/passenger-curl-check'
+			source_file = "#{PlatformInfo.tmpexedir}/passenger-curl-check.c"
+			output_file = "#{PlatformInfo.tmpexedir}/passenger-curl-check"
 			begin
 				found = true
 				File.open(source_file, 'w') do |f|
@@ -510,8 +510,8 @@ module Dependencies # :nodoc: all
 	OpenSSL_Dev = Dependency.new do |dep|
 		dep.name = "OpenSSL development headers"
 		dep.define_checker do |result|
-			source_file = '/tmp/passenger-openssl-check.c'
-			object_file = '/tmp/passenger-openssl-check.o'
+			source_file = "#{PlatformInfo.tmpexedir}/passenger-openssl-check.c"
+			object_file = "#{PlatformInfo.tmpexedir}/passenger-openssl-check.o"
 			begin
 				File.open(source_file, 'w') do |f|
 					f.write("#include <openssl/ssl.h>")
@@ -542,20 +542,22 @@ module Dependencies # :nodoc: all
 	Zlib_Dev = Dependency.new do |dep|
 		dep.name = "Zlib development headers"
 		dep.define_checker do |result|
+			source_file = "#{PlatformInfo.tmpexedir}/zlib-check.c"
+			object_file = "#{PlatformInfo.tmpexedir}/zlib-check.o"
 			begin
-				File.open('/tmp/r8ee-check.c', 'w') do |f|
+				File.open(source_file, 'w') do |f|
 					f.write("#include <zlib.h>")
 				end
-				Dir.chdir('/tmp') do
-					if system("(g++ -c r8ee-check.c) >/dev/null 2>/dev/null")
+				Dir.chdir(File.dirname(source_file)) do
+					if system("(g++ -c zlib-check.c) >/dev/null 2>/dev/null")
 						result.found
 					else
 						result.not_found
 					end
 				end
 			ensure
-				File.unlink('/tmp/r8ee-check.c') rescue nil
-				File.unlink('/tmp/r8ee-check.o') rescue nil
+				File.unlink(source_file) rescue nil
+				File.unlink(object_file) rescue nil
 			end
 		end
 		if RUBY_PLATFORM =~ /linux/
@@ -571,23 +573,6 @@ module Dependencies # :nodoc: all
 		dep.website = "http://www.zlib.net/"
 	end
 	
-	File_Tail = Dependency.new do |dep|
-		dep.name = "file-tail"
-		dep.define_checker do |result|
-			begin
-				begin
-					require 'rubygems'
-				rescue LoadError
-				end
-				require 'file/tail'
-				result.found
-			rescue LoadError
-				result.not_found
-			end
-		end
-		dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install file-tail</b>"
-	end
-	
 	Daemon_Controller = Dependency.new do |dep|
 		dep.name = "daemon_controller >= 0.2.5"
 		dep.install_instructions = "Please install RubyGems first, then run " <<

data/lib/phusion_passenger/platform_info.rb

@@ -137,14 +137,18 @@ private
 	private_class_method :read_file
 
 public
+	class RuntimeError < ::RuntimeError
+	end
+	
 	# Check whether the specified command is in $PATH, and return its
 	# absolute filename. Returns nil if the command is not found.
 	#
 	# This function exists because system('which') doesn't always behave
 	# correctly, for some weird reason.
 	def self.find_command(name)
-		ENV['PATH'].split(File::PATH_SEPARATOR).detect do |directory|
-			path = File.join(directory, name.to_s)
+		name = name.to_s
+		ENV['PATH'].to_s.split(File::PATH_SEPARATOR).detect do |directory|
+			path = File.join(directory, name)
 			if File.file?(path) && File.executable?(path)
 				return path
 			end
@@ -156,6 +160,93 @@ public
 		return !ENV[name].nil? && !ENV[name].empty?
 	end
 	
+	def self.tmpdir
+		result = ENV['TMPDIR']
+		if result && !result.empty?
+			return result.sub(/\/+\Z/, '')
+		else
+			return '/tmp'
+		end
+	end
+	memoize :tmpdir
+	
+	# Returns the directory in which test executables should be placed. The
+	# returned directory is guaranteed to be writable and guaranteed to
+	# not be mounted with the 'noexec' option.
+	# If no such directory can be found then it will raise a PlatformInfo::RuntimeError
+	# with an appropriate error message.
+	def self.tmpexedir
+		basename = "test-exe.#{Process.pid}.#{Thread.current.object_id}"
+		attempts = []
+		
+		dir = tmpdir
+		filename = "#{dir}/#{basename}"
+		begin
+			File.open(filename, 'w').close
+			File.chmod(0700, filename)
+			if File.executable?(filename)
+				return dir
+			else
+				attempts << { :dir => dir,
+					:error => "This directory's filesystem is mounted with the 'noexec' option." }
+			end
+		rescue Errno::ENOENT
+			attempts << { :dir => dir, :error => "This directory doesn't exist." }
+		rescue Errno::EACCES
+			attempts << { :dir => dir, :error => "This program doesn't have permission to write to this directory." }
+		rescue SystemCallError => e
+			attempts << { :dir => dir, :error => e.message }
+		ensure
+			File.unlink(filename) rescue nil
+		end
+		
+		dir = Dir.pwd
+		filename = "#{dir}/#{basename}"
+		begin
+			File.open(filename, 'w').close
+			File.chmod(0700, filename)
+			if File.executable?(filename)
+				return dir
+			else
+				attempts << { :dir => dir,
+					:error => "This directory's filesystem is mounted with the 'noexec' option." }
+			end
+		rescue Errno::ENOENT
+			attempts << { :dir => dir, :error => "This directory doesn't exist." }
+		rescue Errno::EACCES
+			attempts << { :dir => dir, :error => "This program doesn't have permission to write to this directory." }
+		rescue SystemCallError => e
+			attempts << { :dir => dir, :error => e.message }
+		ensure
+			File.unlink(filename) rescue nil
+		end
+		
+		message = "In order to run certain tests, this program " +
+			"must be able to write temporary\n" +
+			"executable files to some directory. However no such " +
+			"directory can be found. \n" +
+			"The following directories have been tried:\n\n"
+		attempts.each do |attempt|
+			message << " * #{attempt[:dir]}\n"
+			message << "   #{attempt[:error]}\n"
+		end
+		message << "\nYou can solve this problem by telling this program what directory to write\n" <<
+			"temporary executable files to.\n" <<
+			"\n" <<
+			"  Set the $TMPDIR environment variable to the desired directory's filename and\n" <<
+			"  re-run this program.\n" <<
+			"\n" <<
+			"Notes:\n" <<
+			"\n" <<
+			" * If you're using 'sudo'/'rvmsudo', remember that 'sudo'/'rvmsudo' unsets all\n" <<
+			"   environment variables, so you must set the environment variable *after*\n" <<
+			"   having gained root privileges.\n" <<
+			" * The directory you choose must writeable and must not be mounted with the\n" <<
+			"   'noexec' option."
+		raise RuntimeError, message
+	end
+	memoize :tmpexedir
+	
 	def self.cc
 		return ENV['CC'] || "gcc"
 	end
@@ -172,7 +263,7 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		filename = File.join("/tmp/passenger-compile-check-#{Process.pid}.c")
+		filename = File.join("#{tmpexedir}/passenger-compile-check-#{Process.pid}.c")
 		File.open(filename, "w") do |f|
 			f.puts(source)
 		end
@@ -193,7 +284,7 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		filename = File.join("/tmp/passenger-link-check-#{Process.pid}.c")
+		filename = File.join("#{tmpexedir}/passenger-link-check-#{Process.pid}.c")
 		File.open(filename, "w") do |f|
 			f.puts(source)
 		end
@@ -214,7 +305,7 @@ public
 		else
 			raise ArgumentError,"Unsupported language '#{language}'"
 		end
-		filename = File.join("/tmp/passenger-compile-check-#{Process.pid}.c")
+		filename = File.join("#{tmpexedir}/passenger-compile-check-#{Process.pid}.c")
 		File.open(filename, "w") do |f|
 			f.puts(source)
 		end