passenger 4.0.48 → 4.0.49

data/build/preprocessor.rb

@@ -24,7 +24,7 @@
 
 # Implements a simple preprocessor language which combines elements in the C
 # preprocessor with ERB:
-# 
+#
 #     Today
 #     #if @today == :fine
 #         is a fine day.
@@ -35,20 +35,20 @@
 #     #endif
 #     Let's go walking.
 #     Today is <%= Time.now %>.
-# 
+#
 # When run with...
-# 
+#
 #     Preprocessor.new.start('input.txt', 'output.txt', :today => :fine)
-# 
+#
 # ...will produce:
-# 
+#
 #     Today
 #     is a fine day.
 #     Let's go walking.
 #     Today is 2013-08-11 22:37:06 +0200.
-# 
+#
 # Highlights:
-# 
+#
 #  * #if blocks can be nested.
 #  * Expressions are Ruby expressions, evaluated within the binding of a
 #    Preprocessor::Evaluator object.
@@ -228,7 +228,7 @@ private
 				return false if table1 != table2
 				v1 = table1[@distribution]
 				v2 = table2[name]
-				
+
 				case comparator
 				when ">"
 					return v1 > v2
@@ -259,7 +259,7 @@ private
 			yield line.chomp
 		end
 	end
-	
+
 	def recognize_command(line)
 		if line =~ /^([\s\t]*)#(.+)/
 			indentation_str = $1
@@ -309,7 +309,7 @@ private
 		# Declare tabs as equivalent to 4 spaces. This is necessary for
 		# Makefiles in which the use of tabs is required.
 		found = $1.to_s.gsub("\t", "    ").size
-		
+
 		if found >= @indentation
 			# Tab-friendly way to remove indentation.
 			remaining = @indentation

data/build/rake_extensions.rb

@@ -34,7 +34,7 @@ module RakeExtensions
 #        sh 'gcc foo.c -shared -fPIC -o libfoo.so'
 #     end
 #  end
-#  
+#
 #  subdir 'bar' do
 #     file 'bar' => ['bar.c', '../foo/libfoo.so'] do
 #         sh 'gcc bar.c -o bar -L../foo -lfoo'
@@ -48,7 +48,7 @@ module RakeExtensions
 #        sh 'gcc foo.c -shared -fPIC -o libfoo.so'
 #     end
 #  end
-#  
+#
 #  file 'bar/bar' => ['bar/bar.c', 'foo/libfoo.so'] do
 #      Dir.chdir('bar') do
 #         sh 'gcc bar.c -o bar -L../foo -lfoo'
@@ -62,11 +62,11 @@ module RakeExtensions
 #
 #  subdir 'foo' do
 #     task 'super_app' => ['super_app:compile', 'super_app:unit_test']
-#  
+#
 #     task 'super_app:compile' do
 #        ...
 #     end
-#  
+#
 #     task 'super_app:unit_test' do
 #        ...
 #     end
@@ -77,11 +77,11 @@ module RakeExtensions
 #  subdir 'foo' do
 #     # !!!!!!!
 #     task 'super_app' => ['foo/super_app:compile', 'foo/super_app:unit_test']
-#  
+#
 #     task 'super_app:compile' do
 #        ...
 #     end
-#  
+#
 #     task 'super_app:unit_test' do
 #        ...
 #     end
@@ -108,12 +108,12 @@ class Subdir # :nodoc:
 	# aren't available in Object anymore.
 	# See: https://github.com/jimweirich/rake/issues/33#issuecomment-1213705
 	include Rake::DSL if defined?(Rake::DSL)
-	
+
 	def initialize(dir)
 		@dir = dir
 		@toplevel_dir = Pathname.getwd
 	end
-	
+
 	def file(args, &block)
 		case args
 		when String
@@ -131,7 +131,7 @@ class Subdir # :nodoc:
 			puts ""
 		end
 	end
-	
+
 	def task(*args, &block)
 		if !args.empty? && args[0].is_a?(Hash)
 			target = args[0].keys[0]
@@ -156,7 +156,7 @@ private
 		path = File.expand_path(path)
 		return Pathname.new(path).relative_path_from(@toplevel_dir).to_s
 	end
-	
+
 	def mangle_path_array(array)
 		array = array.dup
 		array.each_with_index do |item, i|
@@ -166,7 +166,7 @@ private
 		end
 		return array
 	end
-	
+
 	def mangle_path_or_path_array(item)
 		case item
 		when String

data/build/ruby_extension.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2013 Phusion
+#  Copyright (c) 2010-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -56,6 +56,6 @@ else
 	end
 
 	task 'native_support:clean' do
-		sh "echo rm -rf #{output_dir}"
+		sh "rm -rf #{output_dir}"
 	end
 end

data/dev/ci/inituidgid

@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+if grep -q docker_env /etc/group; then
+	delgroup docker_env >/dev/null
+fi
+
+chown -R "$APP_UID:$APP_GID" /home/appa
+groupmod -g "$APP_GID" appa
+usermod -u "$APP_UID" -g "$APP_GID" appa
+
+groupmod -g "$DOCKER_GID" docker
+usermod -a -G docker appa
+
+# There's something strange with either Docker or the kernel, so that
+# the 'appa' user cannot access its home directory even after a proper
+# chown/chmod. We work around it like this.
+mv /home/appa /home/appa2
+cp -dpR /home/appa2 /home/appa
+rm -rf /home/appa2
+
+if [[ $# -gt 0 ]]; then
+  exec "$@"
+fi

data/dev/ci/run_jenkins.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+# This script is run by Jenkins, to execute tests in the CI environment.
+
+set -e
+
+PASSENGER_ROOT=`dirname "$0"`
+PASSENGER_ROOT=`cd "$PASSENGER_ROOT/../.." && pwd`
+
+if [[ "$WORKSPACE" = "" ]]; then
+	echo "Please set WORKSPACE."
+	exit 1
+fi
+
+JENKINS_CACHE_DIR="$WORKSPACE/jenkins_cache"
+mkdir -p "$JENKINS_CACHE_DIR"
+if [[ "$TEST_RPM_BUILDING" != 0 ]]; then
+	rm -rf "$JENKINS_CACHE_DIR/passenger_rpm/output"
+fi
+
+function run_exec()
+{
+	echo "$ $@"
+	exec "$@"
+}
+
+# We do not use the my_init inside the image to work around
+# a bug in baseimage-docker 0.9.12: pressing Ctrl-C does
+# not properly result in a non-zero exit status.
+run_exec docker run --rm \
+	-v "$PASSENGER_ROOT:/passenger" \
+	-v /var/run/docker.sock:/docker.sock \
+	-v "$JENKINS_CACHE_DIR:/host_cache" \
+	-e "DOCKER_HOST=unix:///docker.sock" \
+	-e "DOCKER_GID=`getent group docker | cut -d: -f3`" \
+	-e "PASSENGER_ROOT_ON_DOCKER_HOST=$PASSENGER_ROOT" \
+	-e "CACHE_DIR_ON_DOCKER_HOST=$JENKINS_CACHE_DIR" \
+	-e "APP_UID=`id -u`" \
+	-e "APP_GID=`id -g`" \
+	-e "SUDO=$SUDO" \
+	-e "TEST_CXX=$TEST_CXX" \
+	-e "TEST_RUBY=$TEST_RUBY" \
+	-e "TEST_NODE=$TEST_NODE" \
+	-e "TEST_RUBY_VERSION=$TEST_RUBY_VERSION" \
+	-e "TEST_CLASSIC_RAILS=$TEST_CLASSIC_RAILS" \
+	-e "TEST_RUBYGEMS_VERSION=$TEST_RUBYGEMS_VERSION" \
+	-e "TEST_NGINX=$TEST_NGINX" \
+	-e "TEST_APACHE2=$TEST_APACHE2" \
+	-e "TEST_STANDALONE=$TEST_STANDALONE" \
+	-e "TEST_SOURCE_PACKAGING=$TEST_SOURCE_PACKAGING" \
+	-e "TEST_DEBIAN_PACKAGING=$TEST_DEBIAN_PACKAGING" \
+	-e "TEST_RPM_PACKAGING=$TEST_RPM_PACKAGING" \
+	-e "TEST_RPM_BUILDING=$TEST_RPM_BUILDING" \
+	phusion/apachai-hopachai-sandbox \
+	python /passenger/packaging/rpm/internal/my_init --skip-runit --skip-startup-files --quiet -- \
+	/passenger/dev/ci/inituidgid \
+	/sbin/setuser appa \
+	/bin/bash -lc "cd /passenger && exec ./dev/ci/run_travis.sh"

data/dev/ci/run_rpm_tests.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+# This script is run by run_travis.sh, to execute RPM packaging tests in the CI environment.
+
+set -e
+
+function run()
+{
+	echo "$ $@"
+	"$@"
+}
+
+function retry_run()
+{
+	local reset='\x1B[0m'
+	local red='\x1B[31m'
+	local yellow='\x1B[33m'
+
+	local max_tries="$1"
+	local number=2
+	shift
+
+	echo "$ $@"
+	while true; do
+		if "$@"; then
+			return 0
+		elif [[ $number -le $max_tries ]]; then
+			echo -e "${yellow}The command \"$@\" failed. Retrying, $number of $max_tries:${reset}"
+			(( number++ ))
+		else
+			echo -e "${red}The command \"$@\" failed after $max_tries attempts. Giving up.${reset}"
+			return 1
+		fi
+	done
+}
+
+function yum_install()
+{
+	run yum install -y --skip-broken --enablerepo centosplus "$@"
+}
+
+
+export CACHING=false
+export DEVDEPS_DEFAULT=no
+
+echo '%_excludedocs 0' > /etc/rpm/macros.imgcreate
+sed -i 's/nodocs//' /etc/yum.conf
+
+cp /etc/hosts /etc/workaround-docker-2267/hosts
+cat >> /etc/workaround-docker-2267/hosts <<EOF
+127.0.0.1 passenger.test
+127.0.0.1 mycook.passenger.test
+127.0.0.1 zsfa.passenger.test
+127.0.0.1 norails.passenger.test
+127.0.0.1 1.passenger.test 2.passenger.test 3.passenger.test
+127.0.0.1 4.passenger.test 5.passenger.test 6.passenger.test
+127.0.0.1 7.passenger.test 8.passenger.test 9.passenger.test
+EOF
+
+yum_install /packages/*.x86_64.rpm /packages/*.noarch.rpm
+perl -pi -e 's:/etc/hosts:/cte/hosts:g' /lib64/libnss_files.so.2 /lib64/libc.so.6 /lib64/libresolv.so.2
+sed -i 's|/etc/hosts|/cte/hosts|g' /usr/lib/ruby/1.8/resolv.rb
+chown -R app: /var/log/nginx /var/lib/nginx
+
+
+cd /passenger
+retry_run 3 /system/internal/setuser app \
+	rake test:install_deps BASE_DEPS=yes SUDO=1
+retry_run 3 /system/internal/setuser app \
+	scl enable nodejs010 'rake test:install_deps NODE_MODULES=yes'
+run /system/internal/setuser app \
+	rake test:integration:native_packaging
+run /system/internal/setuser app \
+	env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/site_ruby/1.8/phusion_passenger/locations.ini \
+	scl enable python27 nodejs010 'rake test:integration:apache2'
+run /system/internal/setuser app \
+	env PASSENGER_LOCATION_CONFIGURATION_FILE=/usr/lib/ruby/site_ruby/1.8/phusion_passenger/locations.ini \
+	scl enable python27 nodejs010 'rake test:integration:nginx'

data/dev/{run_travis.sh → ci/run_travis.sh}

@@ -3,12 +3,31 @@
 
 set -e
 
+PASSENGER_ROOT=`dirname "$0"`
+PASSENGER_ROOT=`cd "$PASSENGER_ROOT/../.." && pwd`
+PASSENGER_ROOT_ON_DOCKER_HOST=${PASSENGER_ROOT_ON_DOCKER_HOST:-$PASSENGER_ROOT}
+
+if [[ "$CACHE_DIR_ON_DOCKER_HOST" != "" ]]; then
+	CACHE_DIR=/host_cache
+else
+	CACHE_DIR=/tmp
+	CACHE_DIR_ON_DOCKER_HOST=/tmp
+fi
+
 export VERBOSE=1
 export TRACE=1
 export DEVDEPS_DEFAULT=no
 export rvmsudo_secure_path=1
 
-sudo sh -c 'cat >> /etc/hosts' <<EOF
+if [[ -e /etc/workaround-docker-2267/hosts ]]; then
+	HOSTS_FILE=/etc/workaround-docker-2267/hosts
+	sudo workaround-docker-2267
+	find /usr/local/rvm/rubies/*/lib/ruby -name resolv.rb | sudo xargs sed -i 's|/etc/hosts|/cte/hosts|g'
+else
+	HOSTS_FILE=/etc/hosts
+fi
+
+sudo sh -c "cat >> $HOSTS_FILE" <<EOF
 127.0.0.1 passenger.test
 127.0.0.1 mycook.passenger.test
 127.0.0.1 zsfa.passenger.test
@@ -92,14 +111,18 @@ function install_node_and_modules()
 	fi
 }
 
+if [[ "$MAGNUM" != "" ]]; then
+	run sudo sh -c "echo 127.0.0.1 magnum >> /etc/hosts"
+fi
+
 run uname -a
 run lsb_release -a
-sudo tee /etc/dpkg/dpkg.cfg.d/02apt-speedup >/dev/null <<<"force-unsafe-io"
-cp test/config.json.travis test/config.json
+run sudo tee /etc/dpkg/dpkg.cfg.d/02apt-speedup >/dev/null <<<"force-unsafe-io"
+run cp test/config.json.travis test/config.json
 
 # Relax permissions on home directory so that the application root
 # permission checks pass.
-chmod g+x,o+x $HOME
+run chmod g+x,o+x $HOME
 
 if [[ "$TEST_RUBY_VERSION" != "" ]]; then
 	echo "$ rvm use $TEST_RUBY_VERSION"
@@ -172,6 +195,39 @@ if [[ "$TEST_DEBIAN_PACKAGING" = 1 ]]; then
 		rake test:integration:apache2 SUDO=1
 fi
 
+if [[ "$TEST_RPM_PACKAGING" = 1 ]]; then
+	if [[ "$TEST_RPM_BUILDING" != 0 ]]; then
+		pushd packaging/rpm
+		run mkdir -p "$CACHE_DIR/passenger_rpm"
+		run mkdir -p "$CACHE_DIR/passenger_rpm/cache"
+		run mkdir "$CACHE_DIR/passenger_rpm/output"
+		run ./build -S "$PASSENGER_ROOT_ON_DOCKER_HOST/packaging/rpm" \
+			-P "$PASSENGER_ROOT_ON_DOCKER_HOST" \
+			-o "$CACHE_DIR_ON_DOCKER_HOST/passenger_rpm/output" \
+			-c "$CACHE_DIR_ON_DOCKER_HOST/passenger_rpm/cache" \
+			-d el6 -a x86_64
+		popd >/dev/null
+	fi
+
+	echo "------------- Testing built RPMs -------------"
+	run cp "test/config.json.rpm-automation" "test/config.json"
+	run mkdir -p "$CACHE_DIR/passenger_rpm/output/el6-x86_64"
+	if [[ "$TEST_RPM_BUILDING" != 0 ]]; then
+		run rm "$CACHE_DIR/passenger_rpm/output/el6-x86_64"/*.src.rpm
+	fi
+	run docker run --rm \
+		-v "$PASSENGER_ROOT_ON_DOCKER_HOST/packaging/rpm:/system:ro" \
+		-v "$PASSENGER_ROOT_ON_DOCKER_HOST:/passenger" \
+		-v "$CACHE_DIR_ON_DOCKER_HOST/passenger_rpm/output/el6-x86_64:/packages:ro" \
+		-e "APP_UID=`id -u`" \
+		-e "APP_GID=`id -g`" \
+		phusion/passenger_rpm_automation \
+		/system/internal/my_init --skip-runit --skip-startup-files --quiet -- \
+		/system/internal/inituidgid \
+		/bin/bash -c "cd /passenger && exec ./dev/ci/run_rpm_tests.sh"
+	run cp "test/config.json.travis" "test/config.json"
+fi
+
 if [[ "$TEST_SOURCE_PACKAGING" = 1 ]]; then
 	apt_get_update
 	run sudo apt-get install -y --no-install-recommends source-highlight

data/doc/Users guide Nginx.txt

@@ -958,7 +958,7 @@ include::users_guide_snippets/enterprise_only.txt[]
 
 Enables or disables resistance against deployment errors.
 
-Suppose you've upgraded your application and you've issues a command to restart it (by touching restart.txt), but the application code contains an error that prevents Phusion Passenger from successfully spawning a process (e.g. a syntax error). Phusion Passenger would normally display an error message in response to this.
+Suppose you've upgraded your application and you've issued a command to restart it (e.g. by touching restart.txt), but the application code contains an error that prevents Phusion Passenger from successfully spawning a process (e.g. a syntax error). Phusion Passenger would normally display an error message in response to this.
 
 By enabling deployment error resistance, Phusion Passenger Enterprise would instead do this:
 
@@ -966,7 +966,7 @@ By enabling deployment error resistance, Phusion Passenger Enterprise would inst
 - It logs the error to the global web server error log file.
 - It sets an internal flag so that no processes for this application will be spawned (even when the current traffic would normally result in more processes being spawned) and no processes will be idle cleaned. Processes *could* still be shutdown because of other events, e.g. because their <<PassengerMemoryLimit,memory limit>> have been reached. You can see whether the flag is set by invoking `passenger-status`. If you see the message "Resisting deployment error" then the flag is set.
 
-This way, visitors will suffer minimally from deployment errors. Phusion Passenger will attempt to restart the application again next time restart.txt is touched.
+This way, visitors will suffer minimally from deployment errors. Phusion Passenger will attempt to restart the application again next time restart.txt is touched, or when you issue the `passenger-config restart-app` command.
 
 Enabling deployment error resistance only works if <<PassengerRollingRestarts,rolling restart>> is also enabled.
 

data/doc/users_guide_snippets/environment_variables.txt

@@ -1,5 +1,3 @@
-The Phusion Passenger compilation process can be customized with environment variables.
-
 Environment variables are named values that affect how the system works. For example they tell the system where to look for commands (the `PATH` variable) or where to look for libraries (`LD_LIBRARY_PATH`). Their names are often in all-uppercase. Sometimes people refer to an environment variable with a dollar sign `$` in front, but that's the same thing: when people say "the $PATH environment variable" they mean "the PATH environment variable". This is because the dollar sign `$` is a shell syntax for refering to an environment variable, as you will learn later.
 
 Environment variables are set on a **per-process** basis, but they are **inherited** by child processes. This means that if you set environment variables in process A, another already running process B will not see these new environment variables. But if A spawns a child process C, then C will have all environment variables that A had. If you once again change the environment variables in A, then C will not see the changes.

data/doc/users_guide_snippets/tips.txt

@@ -460,7 +460,7 @@ Here are some of the environment variables which are passed to all hooks, unless
 
 ==== Blocking and concurrency
 
-All hooks block in the background. That is, while your hook command is running, Phusion Passenger can still handle web requests, but the background thread which is running your hook will be blocked and won't be able to perform any further operations. For example, if you wrote a hook script for the `attached_process` event, then Phusion Passenger won't be able to attach further processes until your hook script finishes. You should therefore be careful when writing hook scripts.
+Except when otherwise documented, all hooks block in the background. That is, while your hook command is running, Phusion Passenger can still handle web requests, but the background thread which is running your hook will be blocked and won't be able to perform any further operations. For example, if you wrote a hook script for the `attached_process` event, then Phusion Passenger won't be able to attach further processes until your hook script finishes. You should therefore be careful when writing hook scripts.
 
 If you have a bug in your script and it blocks, then you will be able to see that using the command `passenger-status --show=backtraces` which prints the backtraces of all threads in the Phusion Passenger HelperAgent. Look for the `runSingleHookScript` function in the backtrace. The following example shows at line 2 that Phusion Passenger is waiting for the hook script `/home/phusion/badscript.sh`.
 
@@ -500,6 +500,25 @@ Because hooks are inherently tied to the implementation of Phusion Passenger, th
 +
 Extra environment variables: `PASSENGER_PROCESS_PID`, `PASSENGER_APP_ROOT`. Errors in the hook script are ignored.
 
+`spawn_failed` (since 4.0.49)::
+	Called when an application process could not be spawned. This could happen when:
++
+- The application failing to start. For example: bugs in the application, database problems causing the application to crash, incorrectly installed dependencies.
+- Operating system-level problems, such as running out of memory.
+- The application taking too long to start, and hitting Phusion Passenger's timeout.
+
++
+Extra environment variables:
++
+- `PASSENGER_APP_ROOT`: the path to the application that failed to spawn.
+- `PASSENGER_APP_GROUP_NAME`: the configured app group name.
+- `PASSENGER_ERROR_MESSAGE`: an error message that describes the problem.
+- `PASSENGER_ERROR_ID`: a unique ID for this error event. If you search for this ID in the web server error log files, you should be able to find details about the error.
+- `PASSENGER_APP_ERROR_MESSAGE`: output captured from the application at the time the error occurred.
+
++
+This hook does not block because it's always run in an extra background thread. Errors in the hook script are ignored.
+
 `after_initialize_supergroup`::
 	Called right after Phusion Passenger has allocated data structures for an application, and is about to spawn a process for the first time for this application. Errors in the hook script are ignored. Extra environment variables: `PASSENGER_APP_ROOT`.
 `before_destroy_supergroup`::