passenger 3.9.1.beta → 3.9.2.beta

data/lib/phusion_passenger/standalone/app_finder.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/command.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -34,7 +34,7 @@ class Command
 		:env           => ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development',
 		:max_pool_size => 6,
 		:min_instances => 1,
-		:spawn_method  => 'smart',
+		:spawn_method  => Kernel.respond_to?(:fork) ? 'smart' : 'direct',
 		:nginx_version => PREFERRED_NGINX_VERSION
 	}.freeze
 	
@@ -61,13 +61,13 @@ private
 				require 'daemon_controller'
 				begin
 					require 'daemon_controller/version'
-					too_old = DaemonController::VERSION_STRING < '1.0.0'
+					too_old = DaemonController::VERSION_STRING < '1.1.0'
 				rescue LoadError
 					too_old = true
 				end
 				if too_old
 					error "Your version of daemon_controller is too old. " <<
-					      "You must install 1.0.0 or later. Please upgrade:\n\n" <<
+					      "You must install 1.1.0 or later. Please upgrade:\n\n" <<
 					      
 					      " sudo gem uninstall FooBarWidget-daemon_controller\n" <<
 					      " sudo gem install daemon_controller"
@@ -188,7 +188,7 @@ private
 			if debugging?
 				f.puts "agents=#{PhusionPassenger.agents_dir}"
 			else
-				f.puts "agents=#{passenger_support_files_dir}"
+				f.puts "agents=#{@runtime_dirs[:support_dir]}"
 			end
 			f.puts "helper_scripts=#{PhusionPassenger.helper_scripts_dir}"
 			f.puts "resources=#{PhusionPassenger.resources_dir}"

data/lib/phusion_passenger/standalone/config_file.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/help_command.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/main.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/package_runtime_command.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/runtime_installer.rb

@@ -1,6 +1,6 @@
 #  encoding: utf-8
 #
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/start_command.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010-2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -156,6 +156,10 @@ private
 				wrap_desc("Enable rolling restarts (Enterprise only)")) do
 				@options[:rolling_restarts] = true
 			end
+			opts.on("--resist-deployment-errors",
+				wrap_desc("Enable deployment error resistance (Enterprise only)")) do
+				@options[:resist_deployment_errors] = true
+			end
 			opts.on("--union-station-gateway HOST:PORT", String,
 				wrap_desc("Specify Union Station Gateway host and port")) do |value|
 				host, port = value.split(":", 2)
@@ -252,27 +256,72 @@ private
 		end
 	end
 
-	def check_port(address, port)
-		begin
-			socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
-			sockaddr = Socket.pack_sockaddr_in(port, address)
+	if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+		require 'java'
+		
+		def check_port(host_name, port)
+			channel = java.nio.channels.SocketChannel.open
 			begin
-				socket.connect_nonblock(sockaddr)
-			rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK
-				if select(nil, [socket], nil, 0.1)
+				address = java.net.InetSocketAddress.new(host_name, port)
+				channel.configure_blocking(false)
+				if channel.connect(address)
+					return true
+				end
+
+				deadline = Time.now.to_f + 0.1
+				done = false
+				while true
 					begin
-						socket.connect_nonblock(sockaddr)
-					rescue Errno::EISCONN
+						if channel.finish_connect
+							return true
+						end
+					rescue java.net.ConnectException => e
+						if e.message =~ /Connection refused/i
+							return false
+						else
+							throw e
+						end
+					end
+					
+					# Not done connecting and no error.
+					sleep 0.01
+					if Time.now.to_f >= deadline
+						return false
 					end
-				else
-					raise Errno::ECONNREFUSED
 				end
+			ensure
+				channel.close
+			end
+		end
+	else
+		def check_port(address, port)
+			begin
+				socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
+				sockaddr = Socket.pack_sockaddr_in(port, address)
+				begin
+					socket.connect_nonblock(sockaddr)
+				rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK
+					if select(nil, [socket], nil, 0.1)
+						begin
+							socket.connect_nonblock(sockaddr)
+						rescue Errno::EISCONN
+						rescue Errno::EINVAL
+							if RUBY_PLATFORM =~ /freebsd/i
+								raise Errno::ECONNREFUSED
+							else
+								raise
+							end
+						end
+					else
+						raise Errno::ECONNREFUSED
+					end
+				end
+				return true
+			rescue Errno::ECONNREFUSED
+				return false
+			ensure
+				socket.close if socket && !socket.closed?
 			end
-			return true
-		rescue Errno::ECONNREFUSED
-			return false
-		ensure
-			socket.close if socket
 		end
 	end
 	
@@ -334,13 +383,16 @@ private
 			end
 		end
 		nginx_bin = @options[:nginx_bin] || "#{nginx_dir}/nginx"
-		return {
+		result = {
 			:root => root,
 			:support_dir => "#{root}/support-#{PlatformInfo.cxx_binary_compatibility_id}",
 			:nginx_dir => nginx_dir,
 			:ruby_dir => "#{root}/rubyext-#{PlatformInfo.ruby_extension_binary_compatibility_id}",
 			:nginx_installed => File.exist?(nginx_bin)
 		}
+		result[:support_dir_installed] = File.exist?(result[:support_dir] + "/PassengerWatchdog")
+		result[:everything_installed] = result[:nginx_installed] && result[:support_dir_installed]
+		return result
 	end
 
 	def determine_nginx_runtime_dir(runtime_dir)
@@ -348,8 +400,8 @@ private
 	end
 
 	def ensure_nginx_installed
-		if !@runtime_dirs[:nginx_installed]
-			if @options[:nginx_bin]
+		if !@runtime_dirs[:everything_installed]
+			if !@runtime_dirs[:nginx_installed] && @options[:nginx_bin]
 				error "The given Nginx binary '#{@options[:nginx_bin]}' does not exist."
 				exit 1
 			else
@@ -446,7 +498,7 @@ private
 					end
 				end
 			ensure
-				Process.kill('TERM', f.pid)
+				Process.kill('TERM', f.pid) rescue nil
 			end
 		end
 	end

data/lib/phusion_passenger/standalone/status_command.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/stop_command.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/standalone/utils.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -43,4 +43,4 @@ private
 end
 
 end
-end
+end

data/lib/phusion_passenger/standalone/version_command.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/utils.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010, 2011, 2012 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/utils/ansi_colors.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -56,4 +56,4 @@ module AnsiColors
 end
 
 end # module Utils
-end # module PhusionPassenger
+end # module PhusionPassenger

data/lib/phusion_passenger/utils/file_system_watcher.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/utils/hosts_file_parser.rb

@@ -1,5 +1,5 @@
 # encoding: binary
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -127,4 +127,4 @@ private
 end
 
 end
-end
+end

data/lib/phusion_passenger/utils/robust_interruption.rb

@@ -61,13 +61,17 @@ module RobustInterruption
 	def self.raise(thread, exception = Interrupted)
 		RobustInterruption.disable_interruptions do
 			data = thread[:robust_interruption]
-			data.interrupted = true
-			if data.try_lock
-				begin
-					thread.raise(exception)
-				ensure
-					data.unlock
+			if data
+				data.interrupted = true
+				if data.try_lock
+					begin
+						thread.raise(exception)
+					ensure
+						data.unlock
+					end
 				end
+			else
+				thread.raise(exception)
 			end
 		end
 	end

data/lib/phusion_passenger/utils/tmpdir.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
@@ -67,4 +67,4 @@ protected
 	end
 end
 
-end
+end

data/lib/phusion_passenger/utils/unseekable_socket.rb

@@ -1,4 +1,4 @@
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/lib/phusion_passenger/wsgi/request_handler.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-#  Phusion Passenger - http://www.modrails.com/
+#  Phusion Passenger - https://www.phusionpassenger.com/
 #  Copyright (c) 2010 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.

data/resources/templates/error_layout.html.template

@@ -48,6 +48,10 @@
 				<dd><pre>{{ENVVARS|default=Unknown}}</pre></dd>
 				<dt>Ulimits</dt>
 				<dd><pre>{{ULIMIT|default=Unknown}}</pre></dd>
+				{{if SYSMEMORY}}
+					<dt>System memory usage</dt>
+					<dd><pre>{{SYSMEMORY|default=Unknown}}</pre></dd>
+				{{/if}}
 				{{if RUBY_INFO}}
 					<dt>General Ruby interpreter information</dt>
 					<dd><pre>{{RUBY_INFO}}</pre></dd>

data/resources/templates/nginx/not_available_when_natively_packaged.txt.erb

@@ -1,6 +1,6 @@
 <red>passenger-install-nginx-module is not available when packaged</red>
 
-This Phusion Passenger installation is provided by your packager (as opposed to being installed from source). As such, you cannot use passenger-install-nginx-module. If you want to use passenger-install-nginx-module, please install Phusion Passenger from source by downloading it from <b>www.modrails.com</b>.
+This Phusion Passenger installation is provided by your packager (as opposed to being installed from source). As such, you cannot use passenger-install-nginx-module. If you want to use passenger-install-nginx-module, please install Phusion Passenger from source by downloading it from <b>www.phusionpassenger.com</b>.
 
 For more information about using Phusion Passenger for Nginx, please consult the documentation at one of the following places:
 

data/resources/templates/standalone/config.erb

@@ -47,6 +47,7 @@ http {
     <% if @options[:user] %>passenger_default_user <%= @options[:user] %>;<% end %>
     <% if debugging? %>passenger_log_level 2;<% end %>
     <% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
+    <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
     
     <% if @options[:union_station_gateway_address] %>
         union_station_gateway_address <%= @options[:union_station_gateway_address] %>;

data/test/.rspec

@@ -0,0 +1,3 @@
+--colour
+--format d
+--pattern 'dont_auto_load_anything'

data/test/config.json.travis

@@ -0,0 +1,15 @@
+{
+  "normal_user_1": "games",
+  "normal_user_2": "daemon",
+  "default_user": "man",
+  "normal_group_1": "daemon",
+  "normal_group_2": "man",
+  "default_group": "games",
+
+  "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
+  "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
+  "nonexistant_uid": 9999,
+  "nonexistant_gid": 9999
+
+  // nginx: /usr/local/sbin/nginx
+}

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -1,6 +1,7 @@
 #include <TestSupport.h>
 #include <ApplicationPool2/Spawner.h>
 #include <Utils/json.h>
+#include <fcntl.h>
 
 using namespace Passenger;
 using namespace Passenger::ApplicationPool2;
@@ -48,7 +49,7 @@ namespace tut {
 		options.startTimeout = 300;
 		
 		DirectSpawner spawner(bg.safe, *resourceLocator, generation);
-		spawner.forwardStderr = false;
+		spawner.getConfig()->forwardStderr = false;
 		
 		try {
 			spawner.spawn(options);
@@ -71,7 +72,7 @@ namespace tut {
 		options.startupFile  = ".";
 		
 		DirectSpawner spawner(bg.safe, *resourceLocator, generation);
-		spawner.forwardStderr = false;
+		spawner.getConfig()->forwardStderr = false;
 		
 		try {
 			spawner.spawn(options);

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -18,8 +18,11 @@ namespace tut {
 		ServerInstanceDirPtr serverInstanceDir;
 		ServerInstanceDir::GenerationPtr generation;
 		BackgroundEventLoop bg;
+		SpawnerConfigPtr spawnerConfig;
 		SpawnerFactoryPtr spawnerFactory;
 		PoolPtr pool;
+		Pool::DebugSupportPtr debug;
+		Ticket ticket;
 		GetCallback callback;
 		SessionPtr currentSession;
 		ExceptionPtr currentException;
@@ -31,7 +34,9 @@ namespace tut {
 		ApplicationPool2_PoolTest() {
 			createServerInstanceDirAndGeneration(serverInstanceDir, generation);
 			retainSessions = false;
-			spawnerFactory = make_shared<SpawnerFactory>(bg.safe, *resourceLocator, generation);
+			spawnerConfig = make_shared<SpawnerConfig>();
+			spawnerFactory = make_shared<SpawnerFactory>(bg.safe, *resourceLocator, generation,
+				RandomGeneratorPtr(), spawnerConfig);
 			pool = make_shared<Pool>(bg.safe.get(), spawnerFactory);
 			bg.start();
 			callback = boost::bind(&ApplicationPool2_PoolTest::_callback, this, _1, _2);
@@ -41,17 +46,35 @@ namespace tut {
 			// Explicitly destroy these here because they can run
 			// additional code that depend on other fields in this
 			// class.
-			setLogLevel(0);
 			TRACE_POINT();
 			pool->destroy();
 			UPDATE_TRACE_POINT();
 			pool.reset();
 			UPDATE_TRACE_POINT();
-			lock_guard<boost::mutex> l(syncher);
-			currentSession.reset();
-			sessions.clear();
+			clearAllSessions();
+			setLogLevel(0);
+			SystemTime::releaseAll();
+		}
+
+		void initPoolDebugging() {
+			pool->initDebugging();
+			debug = pool->debugSupport;
 		}
 		
+		void clearAllSessions() {
+			SessionPtr myCurrentSession;
+			list<SessionPtr> mySessions;
+			{
+				LockGuard l(syncher);
+				myCurrentSession = currentSession;
+				mySessions = sessions;
+				currentSession.reset();
+				sessions.clear();
+			}
+			myCurrentSession.reset();
+			mySessions.clear();
+		}
+
 		Options createOptions() {
 			Options options;
 			options.spawnMethod = "dummy";
@@ -139,6 +162,25 @@ namespace tut {
 			);
 			return body;
 		}
+
+		// Ensure that n processes exist.
+		Options ensureMinProcesses(unsigned int n) {
+			Options options = createOptions();
+			options.minProcesses = n;
+			pool->asyncGet(options, callback);
+			EVENTUALLY(5,
+				result = number == 1;
+			);
+			EVENTUALLY(5,
+				result = pool->getProcessCount() == n;
+			);
+			currentSession.reset();
+			return options;
+		}
+
+		void disableProcess(ProcessPtr process, AtomicInt *result) {
+			*result = (int) pool->disableProcess(process->gupid);
+		}
 	};
 	
 	DEFINE_TEST_GROUP_WITH_LIMIT(ApplicationPool2_PoolTest, 100);
@@ -233,7 +275,7 @@ namespace tut {
 	}
 	
 	TEST_METHOD(5) {
-		// If one matching process already exists but it's at full capacity,
+		// If one matching process already exists but it's at full utilization,
 		// and the limits and pool capacity allow spawning of a new process,
 		// then get() will put the get action on the group's wait
 		// queue while spawning a process in the background.
@@ -242,28 +284,30 @@ namespace tut {
 		
 		// Here we test the case in which the existing process becomes
 		// available first.
+		initPoolDebugging();
 		
 		// Spawn a regular process and keep its session open.
 		Options options = createOptions();
-		pool->asyncGet(options, callback);
-		EVENTUALLY(5,
-			result = number == 1;
-		);
-		SessionPtr session1 = currentSession;
-		ProcessPtr process1 = currentSession->getProcess();
-		currentSession.reset();
+		debug->messages->send("Proceed with spawn loop iteration 1");
+		SessionPtr session1 = pool->get(options, &ticket);
+		ProcessPtr process1 = session1->getProcess();
 		
 		// Now spawn a process that never finishes.
-		SpawnerPtr spawner = process1->getGroup()->spawner;
-		dynamic_pointer_cast<DummySpawner>(spawner)->spawnTime = 5000000;
 		pool->asyncGet(options, callback);
 		
 		// Release the session on the first process.
 		session1.reset();
 		
-		ensure_equals("The callback should have been called twice now", number, 2);
+		EVENTUALLY(1,
+			result = number == 1;
+		);
 		ensure_equals("The first process handled the second asyncGet() request",
 			currentSession->getProcess(), process1);
+
+		debug->messages->send("Proceed with spawn loop iteration 2");
+		EVENTUALLY(5,
+			result = number == 1;
+		);
 	}
 	
 	TEST_METHOD(6) {
@@ -341,7 +385,7 @@ namespace tut {
 		options.minProcesses = 2;
 		pool->setMax(2);
 		GroupPtr group = pool->findOrCreateGroup(options);
-		dynamic_pointer_cast<DummySpawner>(group->spawner)->concurrency = 2;
+		spawnerConfig->concurrency = 2;
 		{
 			LockGuard l(pool->syncher);
 			group->spawn();
@@ -395,8 +439,7 @@ namespace tut {
 		options.appGroupName = "test";
 		options.minProcesses = 2;
 		pool->setMax(2);
-		GroupPtr group = pool->findOrCreateGroup(options);
-		dynamic_pointer_cast<DummySpawner>(group->spawner)->concurrency = 2;
+		spawnerConfig->concurrency = 2;
 		
 		vector<SessionPtr> sessions;
 		int expectedNumber = 1;
@@ -445,7 +488,7 @@ namespace tut {
 		options.minProcesses = 2;
 		pool->setMax(3);
 		GroupPtr group = pool->findOrCreateGroup(options);
-		dynamic_pointer_cast<DummySpawner>(group->spawner)->concurrency = 2;
+		spawnerConfig->concurrency = 2;
 		
 		vector<SessionPtr> sessions;
 		int expectedNumber = 1;
@@ -464,7 +507,7 @@ namespace tut {
 		
 		// The next asyncGet() should spawn a new process and the action should be queued.
 		ScopedLock l(pool->syncher);
-		dynamic_pointer_cast<DummySpawner>(group->spawner)->spawnTime = 5000000;
+		spawnerConfig->spawnTime = 5000000;
 		pool->asyncGet(options, callback, false);
 		ensure(group->spawning());
 		ensure_equals(group->getWaitlist.size(), 1u);
@@ -487,7 +530,7 @@ namespace tut {
 		options.minProcesses = 2;
 		pool->setMax(3);
 		GroupPtr group = pool->findOrCreateGroup(options);
-		dynamic_pointer_cast<DummySpawner>(group->spawner)->concurrency = 2;
+		spawnerConfig->concurrency = 2;
 		
 		vector<SessionPtr> sessions;
 		int expectedNumber = 1;
@@ -598,11 +641,60 @@ namespace tut {
 		ensure_equals(superGroup1->getProcessCount(), 0u);
 	}
 	
+	TEST_METHOD(22) {
+		// Suppose the pool is full, and one tries to asyncGet() from a nonexistant group,
+		// and the process that is selected for killing is the sole process in its group.
+		// If there were waiters in the group then those waiters will be satisfied after
+		// capacity has become free.
+		Options options = createOptions();
+		pool->setMax(2);
+		
+		// Get from /foo and retain its session.
+		options.appRoot = "/foo";
+		SystemTime::force(1);
+		SessionPtr session1 = pool->get(options, &ticket);
+		GroupPtr fooGroup = session1->getGroup();
+
+		// Get from /bar and retain its session.
+		options.appRoot = "/bar";
+		SystemTime::force(2);
+		SessionPtr session2 = pool->get(options, &ticket);
+
+		// Request another get(). /foo will now have 1 waiter in its waitlist.
+		options.appRoot = "/foo";
+		pool->asyncGet(options, callback);
+		{
+			LockGuard l(pool->syncher);
+			ensure("(1)", !session1->getProcess()->detached());
+			ensure("(2)", !fooGroup->detached());
+			ensure_equals("(3)", fooGroup->getWaitlist.size(), 1u);
+		}
+
+		// This kill the process for /foo.
+		SystemTime::force(3);
+		options.appRoot = "/baz";
+		SessionPtr session3 = pool->get(options, &ticket);
+		{
+			LockGuard l(pool->syncher);
+			ensure("(4)", session1->getProcess()->detached());
+			ensure("(5)", !fooGroup->detached());
+			ensure_equals("(6)", fooGroup->getWaitlist.size(), 1u);
+			ensure_equals("(7)", pool->getWaitlist.size(), 0u);
+		}
+
+		// Make process /bar available for killing.
+		session2.reset();
+		EVENTUALLY(5,
+			result = number == 1;
+		);
+	}
+	
 	
 	/*********** Test detachProcess() ***********/
 	
 	TEST_METHOD(30) {
-		// detachProcess() detaches the process from the group.
+		// detachProcess() detaches the process from the group. The pool
+		// will restore the minimum number of processes afterwards.
 		Options options = createOptions();
 		options.appGroupName = "test";
 		options.minProcesses = 2;
@@ -616,8 +708,9 @@ namespace tut {
 
 		pool->detachProcess(currentSession->getProcess());
 		ensure(currentSession->getProcess()->detached());
-		LockGuard l(pool->syncher);
-		ensure_equals(pool->superGroups.get("test")->defaultGroup->count, 1);
+		EVENTUALLY(5,
+			result = pool->getProcessCount() == 2;
+		);
 	}
 	
 	TEST_METHOD(31) {
@@ -627,7 +720,7 @@ namespace tut {
 		Options options = createOptions();
 		options.appGroupName = "test";
 		pool->setMax(1);
-		pool->spawnerFactory->dummySpawnTime = 1000000;
+		spawnerConfig->spawnTime = 1000000;
 
 		pool->asyncGet(options, callback);
 		EVENTUALLY(5,
@@ -647,9 +740,13 @@ namespace tut {
 		{
 			LockGuard l(pool->syncher);
 			ensure(pool->superGroups.get("test")->defaultGroup->spawning());
-			ensure_equals(pool->superGroups.get("test")->defaultGroup->count, 0);
+			ensure_equals(pool->superGroups.get("test")->defaultGroup->enabledCount, 0);
 			ensure_equals(pool->superGroups.get("test")->defaultGroup->getWaitlist.size(), 1u);
 		}
+
+		EVENTUALLY(5,
+			result = number == 2;
+		);
 	}
 	
 	TEST_METHOD(32) {
@@ -658,8 +755,9 @@ namespace tut {
 		// by the waiters.
 		Options options = createOptions();
 		options.appGroupName = "test";
+		options.minProcesses = 0;
 		pool->setMax(1);
-		pool->spawnerFactory->dummySpawnTime = 30000;
+		spawnerConfig->spawnTime = 30000;
 
 		// Begin spawning a process.
 		pool->asyncGet(options, callback);
@@ -668,7 +766,8 @@ namespace tut {
 		// asyncGet() on another group should now put it on the waiting list.
 		Options options2 = createOptions();
 		options2.appGroupName = "test2";
-		pool->spawnerFactory->dummySpawnTime = 90000;
+		options2.minProcesses = 0;
+		spawnerConfig->spawnTime = 90000;
 		pool->asyncGet(options2, callback);
 		{
 			LockGuard l(pool->syncher);
@@ -688,6 +787,9 @@ namespace tut {
 			ensure(pool->superGroups.get("test2") != NULL);
 			ensure_equals(pool->getWaitlist.size(), 0u);
 		}
+		EVENTUALLY(5,
+			result = number == 2;
+		);
 	}
 	
 	TEST_METHOD(33) {
@@ -713,48 +815,182 @@ namespace tut {
 
 	TEST_METHOD(40) {
 		// Disabling a process under idle conditions should succeed immediately.
-		/*
+		ensureMinProcesses(2);
+		vector<ProcessPtr> processes = pool->getProcesses();
+		ensure_equals("Disabling succeeds",
+			pool->disableProcess(processes[0]->gupid), DR_SUCCESS);
+		
+		LockGuard l(pool->syncher);
+		ensure(!processes[0]->detached());
+		ensure_equals("Process is disabled",
+			processes[0]->enabled,
+			Process::DISABLED);
+		ensure("Other processes are not affected",
+			!processes[1]->detached());
+		ensure_equals("Other processes are not affected",
+			processes[1]->enabled, Process::ENABLED);
+	}
+
+	TEST_METHOD(41) {
+		// Disabling the sole process in a group should trigger a new process spawn.
+		ensureMinProcesses(1);
 		Options options = createOptions();
-		options.minProcesses = 2;
-		options.noop = true;
-		pool->asyncGet(options, callback);
+		SessionPtr session = pool->get(options, &ticket);
+
+		ensure_equals(pool->getProcessCount(), 1u);
+		ensure(!pool->isSpawning());
+
+		spawnerConfig->spawnTime = 60000;
+		AtomicInt code = -1;
+		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
+			this, session->getProcess(), &code));
+		EVENTUALLY2(100, 1,
+			result = pool->isSpawning();
+		);
+		EVENTUALLY(1,
+			result = pool->getProcessCount() == 2u;
+		);
+		ensure_equals((int) code, -1);
+		session.reset();
+		EVENTUALLY(1,
+			result = code == (int) DR_SUCCESS;
+		);
+	}
+
+	TEST_METHOD(42) {
+		// If there are no enabled processes in the group, then disabling should
+		// succeed after the new process has been spawned.
+		initPoolDebugging();
+		debug->messages->send("Proceed with spawn loop iteration 1");
+		debug->messages->send("Proceed with spawn loop iteration 2");
+
+		Options options = createOptions();
+		SessionPtr session1 = pool->get(options, &ticket);
+		SessionPtr session2 = pool->get(options, &ticket);
+		ensure_equals(pool->getProcessCount(), 2u);
+		GroupPtr group = session1->getGroup();
+
+		AtomicInt code1 = -1, code2 = -1;
+		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
+			this, session1->getProcess(), &code1));
+		TempThread thr2(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
+			this, session2->getProcess(), &code2));
+		EVENTUALLY(2,
+			LockGuard l(pool->syncher);
+			result = group->enabledCount == 0
+				&& group->disablingCount == 2
+				&& group->disabledCount == 0;
+		);
+		session1.reset();
+		session2.reset();
+		SHOULD_NEVER_HAPPEN(20,
+			result = code1 != -1 || code2 != -1;
+		);
+
+		debug->messages->send("Proceed with spawn loop iteration 3");
 		EVENTUALLY(5,
-			result = number == 1;
+			result = code1 == DR_SUCCESS;
 		);
 		EVENTUALLY(5,
-			result = pool->getProcessCount() == 2;
+			result = code2 == DR_SUCCESS;
 		);
+		{
+			LockGuard l(pool->syncher);
+			ensure_equals(group->enabledCount, 1);
+			ensure_equals(group->disablingCount, 0);
+			ensure_equals(group->disabledCount, 2);
+		}
+	}
 
-		options.minProcesses = 0;
-		options.noop = false;
-		vector<ProcessPtr> processes = pool->getProcesses();
-		ensure_equals(processes, );
-		*/
+	TEST_METHOD(43) {
+		// Suppose that a previous disable command triggered a new process spawn,
+		// and the spawn fails. Then any disabling processes should become enabled
+		// again, and the callbacks for the previous disable commands should be called.
+		initPoolDebugging();
+		debug->messages->send("Proceed with spawn loop iteration 1");
+		debug->messages->send("Proceed with spawn loop iteration 2");
+
+		Options options = createOptions();
+		options.minProcesses = 2;
+		SessionPtr session1 = pool->get(options, &ticket);
+		SessionPtr session2 = pool->get(options, &ticket);
+		ensure_equals(pool->getProcessCount(), 2u);
+
+		AtomicInt code1 = -1, code2 = -1;
+		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
+			this, session1->getProcess(), &code1));
+		TempThread thr2(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
+			this, session2->getProcess(), &code2));
+		EVENTUALLY(2,
+			GroupPtr group = session1->getGroup();
+			LockGuard l(pool->syncher);
+			result = group->enabledCount == 0
+				&& group->disablingCount == 2
+				&& group->disabledCount == 0;
+		);
+		SHOULD_NEVER_HAPPEN(20,
+			result = code1 != -1 || code2 != -1;
+		);
+
+		setLogLevel(-2);
+		debug->messages->send("Fail spawn loop iteration 3");
+		EVENTUALLY(5,
+			result = code1 == DR_ERROR;
+		);
+		EVENTUALLY(5,
+			result = code2 == DR_ERROR;
+		);
+		{
+			GroupPtr group = session1->getGroup();
+			LockGuard l(pool->syncher);
+			ensure_equals(group->enabledCount, 2);
+			ensure_equals(group->disablingCount, 0);
+			ensure_equals(group->disabledCount, 0);
+		}
 	}
 
-	// Disabling the sole process in a group should trigger a new process spawn.
-	// Disabling should succeed after the new process has been spawned.
+	// asyncGet() should not select a disabling process if there are enabled processes.
+	// asyncGet() should not select a disabling process when non-rolling restarting.
+	// asyncGet() should select a disabling process if there are no enabled processes
+	// in the group. If this happens then asyncGet() will also spawn a new process.
+	// asyncGet() should not select a disabled process.
 
-	// Duppose that a previous disable command triggered a new process spawn,
-	// and the spawn fails. Then the processes which were marked as 'disabled'
-	// should be marked 'enabled' again, and the callbacks for the previous
-	// disable commands should be called.
+	// If there are no enabled processes and all disabling processes are at full
+	// utilization, and the process that was being spawned becomes available
+	// earlier than any of the disabling processes, then the newly spawned process
+	// should handle the request.
 
-	// asyncGet() should not select a process that's being disabled, unless
-	// it's the only process in the group.
+	// A disabling process becomes disabled as soon as it's done with
+	// all its request.
 
-	// Disabling a process that's already being disabled should result in the
-	// callback being called after disabling is done.
+	TEST_METHOD(50) {
+		// Disabling a process that's already being disabled should result in the
+		// callback being called after disabling is done.
+		ensureMinProcesses(2);
+		Options options = createOptions();
+		SessionPtr session = pool->get(options, &ticket);
 
-	// Enabling a process that's being disabled should immediately mark the process
-	// as being enabled and should call all the queued disable command callbacks.
+		AtomicInt code = -1;
+		TempThread thr(boost::bind(&ApplicationPool2_PoolTest::disableProcess,
+			this, session->getProcess(), &code));
+		SHOULD_NEVER_HAPPEN(100,
+			result = code != -1;
+		);
+		session.reset();
+		EVENTUALLY(1,
+			result = code != -1;
+		);
+		ensure_equals(code, (int) DR_SUCCESS);
+	}
 
-	// Enabling a process that's disabled works.
+	// Enabling a process that's disabled succeeds immediately.
+	// Enabling a process that's disabling succeeds immediately. The disable
+	// callbacks will be called with DR_CANCELED.
 	
 	
 	/*********** Other tests ***********/
 	
-	TEST_METHOD(50) {
+	TEST_METHOD(60) {
 		// The pool is considered to be at full capacity if and only
 		// if all SuperGroups are at full capacity.
 		Options options = createOptions();
@@ -778,7 +1014,7 @@ namespace tut {
 		ensure(!pool->atFullCapacity());
 	}
 	
-	TEST_METHOD(51) {
+	TEST_METHOD(61) {
 		// If the pool is at full capacity, then increasing 'max' will cause
 		// new processes to be spawned. Any queued get requests are processed
 		// as those new processes become available or as existing processes
@@ -801,7 +1037,7 @@ namespace tut {
 		ensure_equals(pool->getProcessCount(), 3u);
 	}
 	
-	TEST_METHOD(52) {
+	TEST_METHOD(62) {
 		// Each spawned process has a GUPID, which can be looked up
 		// through findProcessByGupid().
 		Options options = createOptions();
@@ -814,13 +1050,13 @@ namespace tut {
 		ensure_equals(currentSession->getProcess(), pool->findProcessByGupid(gupid));
 	}
 	
-	TEST_METHOD(53) {
+	TEST_METHOD(63) {
 		// findProcessByGupid() returns a NULL pointer if there is
 		// no matching process.
 		ensure(pool->findProcessByGupid("none") == NULL);
 	}
 
-	TEST_METHOD(54) {
+	TEST_METHOD(64) {
 		// Test process idle cleaning.
 		Options options = createOptions();
 		retainSessions = true;
@@ -851,7 +1087,7 @@ namespace tut {
 		);
 	}
 
-	TEST_METHOD(55) {
+	TEST_METHOD(65) {
 		// Test spawner idle cleaning.
 		Options options = createOptions();
 		options.appGroupName = "test1";
@@ -877,7 +1113,7 @@ namespace tut {
 		);
 	}
 
-	TEST_METHOD(56) {
+	TEST_METHOD(66) {
 		// It should restart the app if restart.txt is created or updated.
 		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
 		Options options = createOptions();
@@ -913,19 +1149,21 @@ namespace tut {
 		ensure_equals(sendRequest(options, "/"), "restarted 2");
 	}
 
-	TEST_METHOD(57) {
+	TEST_METHOD(67) {
 		// Test spawn exceptions.
 		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
 		options.spawnMethod = "direct";
-		spawnerFactory->forwardStderr = false;
+		spawnerConfig->forwardStderr = false;
 
 		writeFile("tmp.wsgi/passenger_wsgi.py",
 			"import sys\n"
 			"sys.stderr.write('Something went wrong!')\n"
 			"exit(1)\n");
+
+		setLogLevel(-2);
 		pool->asyncGet(options, callback);
 		EVENTUALLY(5,
 			result = number == 1;
@@ -936,7 +1174,7 @@ namespace tut {
 		ensure_equals(e->getErrorPage(), "Something went wrong!");
 	}
 
-	TEST_METHOD(58) {
+	TEST_METHOD(68) {
 		// If a process fails to spawn, then it stops trying to spawn minProcesses processes.
 		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
 		Options options = createOptions();
@@ -944,9 +1182,10 @@ namespace tut {
 		options.appType = "wsgi";
 		options.spawnMethod = "direct";
 		options.minProcesses = 4;
-		spawnerFactory->forwardStderr = false;
+		spawnerConfig->forwardStderr = false;
 
 		writeFile("tmp.wsgi/counter", "0");
+		chmod("tmp.wsgi/counter", 0666);
 		// Our application starts successfully the first two times,
 		// and fails all the other times.
 		writeFile("tmp.wsgi/passenger_wsgi.py",
@@ -963,6 +1202,7 @@ namespace tut {
 			"	sys.stderr.write('Something went wrong!')\n"
 			"	exit(1)\n");
 
+		setLogLevel(-2);
 		pool->asyncGet(options, callback);
 		EVENTUALLY(5,
 			result = number == 1;
@@ -971,14 +1211,14 @@ namespace tut {
 			result = pool->getProcessCount() == 2;
 		);
 		EVENTUALLY(2,
-			result = !pool->getSuperGroup("tmp.wsgi")->defaultGroup->spawning();
+			result = !pool->isSpawning();
 		);
 		SHOULD_NEVER_HAPPEN(500,
 			result = pool->getProcessCount() > 2;
 		);
 	}
 
-	TEST_METHOD(59) {
+	TEST_METHOD(69) {
 		// It removes the process from the pool if session->initiate() fails.
 		Options options = createOptions();
 		options.appRoot = "stub/wsgi";
@@ -1006,7 +1246,7 @@ namespace tut {
 		ensure_equals(pool->getProcessCount(), 0u);
 	}
 
-	TEST_METHOD(60) {
+	TEST_METHOD(70) {
 		// When a process has become idle, and there are waiters on the pool,
 		// consider detaching it in order to satisfy a waiter.
 		Options options1 = createOptions();
@@ -1033,84 +1273,63 @@ namespace tut {
 		ensure_equals(pool->getProcessCount(), 2u);
 		SuperGroupPtr superGroup1 = pool->superGroups.get("stub/rack");
 		SuperGroupPtr superGroup2 = pool->superGroups.get("stub/rack");
-		ensure_equals(superGroup1->defaultGroup->count, 1);
-		ensure_equals(superGroup2->defaultGroup->count, 1);
+		ensure_equals(superGroup1->defaultGroup->enabledCount, 1);
+		ensure_equals(superGroup2->defaultGroup->enabledCount, 1);
 	}
 
-	TEST_METHOD(61) {
+	TEST_METHOD(71) {
 		// A process is detached after processing maxRequests sessions.
-		{
-			Ticket ticket;
-			Options options = createOptions();
-			options.maxRequests = 5;
-			pool->setMax(1);
-			pool->get(options, &ticket).reset();
-
-			vector<ProcessPtr> processes = pool->getProcesses();
-			ensure_equals(processes.size(), 1u);
-			pid_t origPid = processes[0]->pid;
+		Options options = createOptions();
+		options.minProcesses = 0;
+		options.maxRequests = 5;
+		pool->setMax(1);
 
-			for (int i = 0; i < 3; i++) {
-				pool->get(options, &ticket).reset();
-				processes = pool->getProcesses();
-				ensure_equals(processes.size(), 1u);
-				ensure_equals(processes[0]->pid, origPid);
-			}
+		SessionPtr session = pool->get(options, &ticket);
+		ensure_equals(pool->getProcessCount(), 1u);
+		pid_t origPid = session->getPid();
+		session.reset();
 
+		for (int i = 0; i < 3; i++) {
 			pool->get(options, &ticket).reset();
+			ensure_equals(pool->getProcessCount(), 1u);
+			ensure_equals(pool->getProcesses()[0]->pid, origPid);
 		}
+
+		pool->get(options, &ticket).reset();
 		EVENTUALLY(2,
 			result = pool->getProcessCount() == 0;
 		);
 	}
 
-	TEST_METHOD(62) {
+	TEST_METHOD(72) {
 		// If we restart while spawning is in progress, then the spawn
 		// loop will exit as soon as it has detected that we're restarting.
 		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
-		spawnerFactory->dummySpawnTime = 20000;
-		spawnerFactory->dummySpawnerCreationSleepTime = 100000;
-
+		initPoolDebugging();
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.minProcesses = 3;
 
-		// Trigger spawn loop. The spawn loop itself won't take longer than 3*20=60 msec.
-		pool->findOrCreateGroup(options);
-		ScopedLock l(pool->syncher);
-		pool->asyncGet(options, callback, false);
-		// Wait until spawn loop tries to grab the lock.
-		EVENTUALLY(3,
-			LockGuard l2(pool->debugSyncher);
-			result = pool->spawnLoopIteration == 1;
-		);
-		l.unlock();
-
-		// At this point, the spawn loop is about to attach its first spawned
-		// process to the group. We wait until it has succeeded doing so.
-		// Remaining maximum time in the spawn loop: 2*20=40 msec.
-		EVENTUALLY2(200, 0,
-			result = pool->getProcessCount() == 1;
-		);
-
-		// Trigger restart. It will immediately detach the sole process in the pool,
-		// and it will finish after approximately 100 msec,
-		// allowing the spawn loop to detect that the restart flag is true.
-		touchFile("tmp.wsgi/tmp/restart.txt");
+		// Trigger spawn loop and freeze it at the point where it's spawning a process.
 		pool->asyncGet(options, callback);
-		ensure_equals("(1)", pool->getProcessCount(), 0u);
+		debug->debugger->recv("Begin spawn loop iteration 1");
 
-		// The spawn loop will succeed at spawning the second process.
-		// Upon attaching it, it should detect the restart the stop,
-		// so that it never spawns the third process.
-		SHOULD_NEVER_HAPPEN(300,
-			LockGuard l2(pool->debugSyncher);
-			result = pool->spawnLoopIteration > 2;
-		);
-		ensure_equals("(2)", pool->getProcessCount(), 1u);
+		// Trigger restart, freeze the restart procedure, then let spawn loop continue.
+		touchFile("tmp.wsgi/tmp/restart.txt", 1);
+		pool->asyncGet(options, callback);
+		debug->debugger->recv("About to end restarting");
+		debug->messages->send("Proceed with spawn loop iteration 1");
+
+		// The spawn loop will succeed at spawning this process.
+		// After the spawn loop attaches the process, it should detect the
+		// restart and stop, so that it never spawns the second and third processes.
+		debug->debugger->recv("Spawn loop done");
+		ensure_equals(debug->debugger->peek("At spawn loop iteration 2"), MessagePtr());
+		ensure_equals(debug->debugger->peek("At spawn loop iteration 3"), MessagePtr());
+		ensure_equals("(1)", pool->getProcessCount(), 1u);
 	}
 
-	TEST_METHOD(63) {
+	TEST_METHOD(73) {
 		// If a get() request comes in while the restart is in progress, then
 		// that get() request will be put into the get waiters list, which will
 		// be processed after spawning is done.
@@ -1126,7 +1345,7 @@ namespace tut {
 		);
 		
 		// Trigger a restart. The creation of the new spawner should take a while.
-		spawnerFactory->dummySpawnerCreationSleepTime = 20000;
+		spawnerConfig->spawnerCreationSleepTime = 20000;
 		touchFile("tmp.wsgi/tmp/restart.txt");
 		pool->asyncGet(options, callback);
 		GroupPtr group = pool->findOrCreateGroup(options);
@@ -1143,14 +1362,15 @@ namespace tut {
 			pool->getProcessCount(), 2u);
 	}
 
-	TEST_METHOD(64) {
+	TEST_METHOD(74) {
 		// If a process fails to spawn, it sends a SpawnException result to all get waiters.
 		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
+		chmod("tmp.wsgi", 0777);
 		Options options = createOptions();
 		options.appRoot = "tmp.wsgi";
 		options.appType = "wsgi";
 		options.spawnMethod = "direct";
-		spawnerFactory->forwardStderr = false;
+		spawnerConfig->forwardStderr = false;
 		pool->setMax(1);
 
 		writeFile("tmp.wsgi/passenger_wsgi.py",
@@ -1172,6 +1392,7 @@ namespace tut {
 			"exit(1)\n");
 
 		retainSessions = true;
+		setLogLevel(-2);
 		pool->asyncGet(options, callback);
 		pool->asyncGet(options, callback);
 		pool->asyncGet(options, callback);
@@ -1191,7 +1412,7 @@ namespace tut {
 		ensure(sessions.empty());
 	}
 
-	TEST_METHOD(65) {
+	TEST_METHOD(75) {
 		// If a process fails to spawn, the existing processes
 		// are kept alive.
 		TempDirCopy dir("stub/wsgi", "tmp.wsgi");
@@ -1200,7 +1421,7 @@ namespace tut {
 		options.appType = "wsgi";
 		options.spawnMethod = "direct";
 		options.minProcesses = 2;
-		spawnerFactory->forwardStderr = false;
+		spawnerConfig->forwardStderr = false;
 
 		// Spawn 2 processes.
 		retainSessions = true;
@@ -1217,7 +1438,7 @@ namespace tut {
 			"sys.stderr.write('Something went wrong!')\n"
 			"exit(1)\n");
 		try {
-			Ticket ticket;
+			setLogLevel(-2);
 			currentSession = pool->get(options, &ticket);
 			fail("SpawnException expected");
 		} catch (const SpawnException &) {