passenger 5.0.9 → 5.0.10

data/ext/common/{ApplicationPool2 → SpawningKit}/DummySpawner.h

@@ -22,13 +22,14 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_APPLICATION_POOL2_DUMMY_SPAWNER_H_
-#define _PASSENGER_APPLICATION_POOL2_DUMMY_SPAWNER_H_
+#ifndef _PASSENGER_SPAWNING_KIT_DUMMY_SPAWNER_H_
+#define _PASSENGER_SPAWNING_KIT_DUMMY_SPAWNER_H_
 
-#include <ApplicationPool2/Spawner.h>
+#include <SpawningKit/Spawner.h>
+#include <boost/atomic.hpp>
 
 namespace Passenger {
-namespace ApplicationPool2 {
+namespace SpawningKit {
 
 using namespace std;
 using namespace boost;
@@ -37,43 +38,42 @@ using namespace oxt;
 
 class DummySpawner: public Spawner {
 private:
-	boost::mutex lock;
-	unsigned int count;
+	boost::atomic<unsigned int> count;
 
 public:
 	unsigned int cleanCount;
 
-	DummySpawner(const SpawnerConfigPtr &_config)
-		: Spawner(_config)
-	{
-		count = 0;
-		cleanCount = 0;
-	}
+	DummySpawner(const ConfigPtr &_config)
+		: Spawner(_config),
+		  count(1),
+		  cleanCount(0)
+		{ }
 
-	virtual SpawnObject spawn(const Options &options) {
+	virtual Result spawn(const Options &options) {
 		TRACE_POINT();
 		possiblyRaiseInternalError(options);
 
-		pid_t pid;
-		{
-			boost::lock_guard<boost::mutex> l(lock);
-			count++;
-			pid = count;
-		}
-
-		SocketPair adminSocket = createUnixSocketPair(__FILE__, __LINE__);
-		SocketList sockets;
-		sockets.add(pid, "main", "tcp://127.0.0.1:1234", "session", config->concurrency);
 		syscalls::usleep(config->spawnTime);
 
-		SpawnObject object;
-		string gupid = "gupid-" + toString(pid);
-		object.process = boost::make_shared<Process>(
-			pid, gupid,
-			adminSocket.second, FileDescriptor(), sockets,
-			SystemTime::getUsec(), SystemTime::getUsec());
-		object.process->dummy = true;
-		return boost::move(object);
+		SocketPair adminSocket = createUnixSocketPair(__FILE__, __LINE__);
+		unsigned int number = count.fetch_add(1, boost::memory_order_relaxed);
+		Result result;
+		Json::Value socket;
+
+		socket["name"] = "main";
+		socket["address"] = "tcp://127.0.0.1:1234";
+		socket["protocol"] = "session";
+		socket["concurrency"] = config->concurrency;
+
+		result["type"] = "dummy";
+		result["pid"] = number;
+		result["gupid"] = "gupid-" + toString(number);
+		result["spawner_creation_time"] = (Json::UInt64) SystemTime::getUsec();
+		result["spawn_start_time"] = (Json::UInt64) SystemTime::getUsec();
+		result["sockets"].append(socket);
+		result.adminSocket = adminSocket.second;
+
+		return result;
 	}
 
 	virtual bool cleanable() const {
@@ -88,7 +88,7 @@ public:
 typedef boost::shared_ptr<DummySpawner> DummySpawnerPtr;
 
 
-} // namespace ApplicationPool2
+} // namespace SpawningKit
 } // namespace Passenger
 
-#endif /* _PASSENGER_APPLICATION_POOL2_DUMMY_SPAWNER_H_ */
+#endif /* _PASSENGER_SPAWNING_KIT_DUMMY_SPAWNER_H_ */

data/ext/common/{ApplicationPool2/SpawnerFactory.h → SpawningKit/Factory.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011-2014 Phusion
+ *  Copyright (c) 2011-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -22,26 +22,26 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_APPLICATION_POOL2_SPAWNER_FACTORY_H_
-#define _PASSENGER_APPLICATION_POOL2_SPAWNER_FACTORY_H_
+#ifndef _PASSENGER_SPAWNING_KIT_FACTORY_H_
+#define _PASSENGER_SPAWNING_KIT_FACTORY_H_
 
-#include <ApplicationPool2/Spawner.h>
-#include <ApplicationPool2/SmartSpawner.h>
-#include <ApplicationPool2/DirectSpawner.h>
-#include <ApplicationPool2/DummySpawner.h>
+#include <SpawningKit/Spawner.h>
+#include <SpawningKit/SmartSpawner.h>
+#include <SpawningKit/DirectSpawner.h>
+#include <SpawningKit/DummySpawner.h>
 
 namespace Passenger {
-namespace ApplicationPool2 {
+namespace SpawningKit {
 
 using namespace std;
 using namespace boost;
 using namespace oxt;
 
 
-class SpawnerFactory {
+class Factory {
 private:
 	boost::mutex syncher;
-	SpawnerConfigPtr config;
+	ConfigPtr config;
 	DummySpawnerPtr dummySpawner;
 
 	SpawnerPtr tryCreateSmartSpawner(const Options &options) {
@@ -58,11 +58,11 @@ private:
 	}
 
 public:
-	SpawnerFactory(const SpawnerConfigPtr &_config)
+	Factory(const ConfigPtr &_config)
 		: config(_config)
 		{ }
 
-	virtual ~SpawnerFactory() { }
+	virtual ~Factory() { }
 
 	virtual SpawnerPtr create(const Options &options) {
 		if (options.spawnMethod == "smart" || options.spawnMethod == "smart-lv2") {
@@ -97,17 +97,17 @@ public:
 	}
 
 	/**
-	 * All created Spawner objects share the same SpawnerConfig object.
+	 * All created Spawner objects share the same Config object.
 	 */
-	const SpawnerConfigPtr &getConfig() const {
+	const ConfigPtr &getConfig() const {
 		return config;
 	}
 };
 
-typedef boost::shared_ptr<SpawnerFactory> SpawnerFactoryPtr;
+typedef boost::shared_ptr<Factory> FactoryPtr;
 
 
-} // namespace ApplicationPool2
+} // namespace SpawningKit
 } // namespace Passenger
 
-#endif /* _PASSENGER_APPLICATION_POOL2_SPAWNER_FACTORY_H_ */
+#endif /* _PASSENGER_SPAWNING_KIT_FACTORY_H_ */

data/ext/common/{ApplicationPool2/ComponentInfo.h → SpawningKit/Options.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2011, 2012 Phusion
+ *  Copyright (c) 2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -22,32 +22,19 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_APPLICATION_POOL2_COMPONENT_INFO_H_
-#define _PASSENGER_APPLICATION_POOL2_COMPONENT_INFO_H_
+#ifndef _PASSENGER_SPAWNING_KIT_OPTIONS_H_
+#define _PASSENGER_SPAWNING_KIT_OPTIONS_H_
 
-#include <string>
+#include <ApplicationPool2/Options.h>
 
 namespace Passenger {
-namespace ApplicationPool2 {
+namespace SpawningKit {
 
-using namespace std;
 
+typedef ApplicationPool2::Options Options;
 
-struct ComponentInfo {
-	string name;
-	bool   isDefault;
 
-	/****************/
-	/****************/
-
-	ComponentInfo() {
-		isDefault = false;
-		/******************/
-	}
-};
-
-
-} // namespace ApplicationPool2
+} // namespace SpawningKit
 } // namespace Passenger
 
-#endif /* _PASSENGER_APPLICATION_POOL2_COMPONENT_INFO_H_ */
+#endif /* _PASSENGER_SPAWNING_KIT_OPTIONS_H_ */

data/ext/common/SpawningKit/PipeWatcher.h

@@ -0,0 +1,148 @@
+/*
+ *  Phusion Passenger - https://www.phusionpassenger.com/
+ *  Copyright (c) 2012-2015 Phusion
+ *
+ *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ *  THE SOFTWARE.
+ */
+#ifndef _PASSENGER_SPAwNING_KIT_PIPE_WATCHER_H_
+#define _PASSENGER_SPAwNING_KIT_PIPE_WATCHER_H_
+
+#include <boost/shared_ptr.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/thread.hpp>
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/foreach.hpp>
+#include <oxt/thread.hpp>
+#include <oxt/backtrace.hpp>
+#include <vector>
+
+#include <sys/types.h>
+
+#include <SpawningKit/Config.h>
+#include <FileDescriptor.h>
+#include <Constants.h>
+#include <Logging.h>
+#include <Utils.h>
+#include <Utils/StrIntUtils.h>
+
+namespace Passenger {
+namespace SpawningKit {
+
+using namespace boost;
+
+
+/** A PipeWatcher lives until the file descriptor is closed. */
+class PipeWatcher: public boost::enable_shared_from_this<PipeWatcher> {
+private:
+	ConfigPtr config;
+	FileDescriptor fd;
+	const char *name;
+	pid_t pid;
+	bool started;
+	boost::mutex startSyncher;
+	boost::condition_variable startCond;
+
+	static void threadMain(boost::shared_ptr<PipeWatcher> self) {
+		TRACE_POINT();
+		self->threadMain();
+	}
+
+	void threadMain() {
+		TRACE_POINT();
+		{
+			boost::unique_lock<boost::mutex> lock(startSyncher);
+			while (!started) {
+				startCond.wait(lock);
+			}
+		}
+
+		UPDATE_TRACE_POINT();
+		while (!this_thread::interruption_requested()) {
+			char buf[1024 * 8];
+			ssize_t ret;
+
+			UPDATE_TRACE_POINT();
+			ret = syscalls::read(fd, buf, sizeof(buf));
+			if (ret == 0) {
+				break;
+			} else if (ret == -1) {
+				UPDATE_TRACE_POINT();
+				if (errno == ECONNRESET) {
+					break;
+				} else if (errno != EAGAIN) {
+					int e = errno;
+					P_WARN("Cannot read from process " << pid << " " << name <<
+						": " << strerror(e) << " (errno=" << e << ")");
+					break;
+				}
+			} else if (ret == 1 && buf[0] == '\n') {
+				UPDATE_TRACE_POINT();
+				printAppOutput(pid, name, "", 0);
+			} else {
+				UPDATE_TRACE_POINT();
+				vector<StaticString> lines;
+				ssize_t ret2 = ret;
+				if (ret2 > 0 && buf[ret2 - 1] == '\n') {
+					ret2--;
+				}
+				split(StaticString(buf, ret2), '\n', lines);
+				foreach (const StaticString line, lines) {
+					printAppOutput(pid, name, line.data(), line.size());
+				}
+			}
+
+			if (config->outputHandler) {
+				config->outputHandler(buf, ret);
+			}
+		}
+	}
+
+public:
+	PipeWatcher(const ConfigPtr &_config, const FileDescriptor &_fd,
+		const char *_name, pid_t _pid)
+		: config(_config),
+		  fd(_fd),
+		  name(_name),
+		  pid(_pid),
+		  started(false)
+		{ }
+
+	void initialize() {
+		oxt::thread(boost::bind(threadMain, shared_from_this()),
+			"PipeWatcher: PID " + toString(pid) + " " + name + ", fd " + toString(fd),
+			POOL_HELPER_THREAD_STACK_SIZE);
+	}
+
+	void start() {
+		boost::lock_guard<boost::mutex> lock(startSyncher);
+		started = true;
+		startCond.notify_all();
+	}
+};
+
+typedef boost::shared_ptr<PipeWatcher> PipeWatcherPtr;
+
+
+} // namespace SpawningKit
+} // namespace Passenger
+
+#endif /* _PASSENGER_SPAwNING_KIT_PIPE_WATCHER_H_ */

data/ext/common/{ApplicationPool2/PipeWatcher.h → SpawningKit/Result.h}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2012-2013 Phusion
+ *  Copyright (c) 2014-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -22,46 +22,28 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_APPLICATION_POOL_PIPE_WATCHER_H_
-#define _PASSENGER_APPLICATION_POOL_PIPE_WATCHER_H_
+#ifndef _PASSENGER_SPAWNING_KIT_RESULT_H_
+#define _PASSENGER_SPAWNING_KIT_RESULT_H_
 
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/thread.hpp>
-#include <boost/function.hpp>
-#include <sys/types.h>
 #include <FileDescriptor.h>
+#include <Utils/json.h>
 
 namespace Passenger {
-namespace ApplicationPool2 {
+namespace SpawningKit {
 
-using namespace boost;
 
-
-/** A PipeWatcher lives until the file descriptor is closed. */
-struct PipeWatcher: public boost::enable_shared_from_this<PipeWatcher> {
-	// For unit tests.
-	typedef boost::function<void (const char *data, unsigned int size)> DataCallback;
-	static DataCallback onData;
-
-	FileDescriptor fd;
-	const char *name;
-	pid_t pid;
-	bool started;
-	boost::mutex startSyncher;
-	boost::condition_variable startCond;
-
-	PipeWatcher(const FileDescriptor &_fd, const char *name, pid_t pid);
-	void initialize();
-	void start();
-	static void threadMain(boost::shared_ptr<PipeWatcher> self);
-	void threadMain();
+/**
+ * Represents the result of a spawning operation. It is a JSON document
+ * containing information about the spawned process, such as its PID,
+ * GUPID, etc. In addition, it contains two file descriptors.
+ */
+struct Result: public Json::Value {
+	FileDescriptor adminSocket;
+	FileDescriptor errorPipe;
 };
 
-typedef boost::shared_ptr<PipeWatcher> PipeWatcherPtr;
-
 
-} // namespace ApplicationPool2
+} // namespace SpawningKit
 } // namespace Passenger
 
-#endif /* _PASSENGER_APPLICATION_POOL_PIPE_WATCHER_H_ */
+#endif /* _PASSENGER_SPAWNING_KIT_RESULT_H_ */

data/ext/common/{ApplicationPool2 → SpawningKit}/SmartSpawner.h

@@ -22,14 +22,15 @@
  *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  *  THE SOFTWARE.
  */
-#ifndef _PASSENGER_APPLICATION_POOL2_SMART_SPAWNER_H_
-#define _PASSENGER_APPLICATION_POOL2_SMART_SPAWNER_H_
+#ifndef _PASSENGER_SPAWNING_KIT_SMART_SPAWNER_H_
+#define _PASSENGER_SPAWNING_KIT_SMART_SPAWNER_H_
 
-#include <ApplicationPool2/Spawner.h>
+#include <SpawningKit/Spawner.h>
+#include <SpawningKit/PipeWatcher.h>
 #include <Constants.h>
 
 namespace Passenger {
-namespace ApplicationPool2 {
+namespace SpawningKit {
 
 using namespace std;
 using namespace boost;
@@ -60,12 +61,6 @@ private:
 		}
 	};
 
-	struct SpawnResult {
-		pid_t pid;
-		FileDescriptor adminSocket;
-		BufferedIO io;
-	};
-
 	const vector<string> preloaderCommand;
 	map<string, string> preloaderAnnotations;
 	Options options;
@@ -104,8 +99,8 @@ private:
 		vector<string> command;
 
 		if (shouldLoadShellEnvvars(options, preparation)) {
-			command.push_back(preparation.shell);
-			command.push_back(preparation.shell);
+			command.push_back(preparation.userSwitching.shell);
+			command.push_back(preparation.userSwitching.shell);
 			command.push_back("-lc");
 			command.push_back("exec \"$@\"");
 			command.push_back("SpawnPreparerShell");
@@ -214,7 +209,8 @@ private:
 		vector<string> command = createRealPreloaderCommand(options, args);
 		SocketPair adminSocket = createUnixSocketPair(__FILE__, __LINE__);
 		Pipe errorPipe = createPipe(__FILE__, __LINE__);
-		DebugDirPtr debugDir = boost::make_shared<DebugDir>(preparation.uid, preparation.gid);
+		DebugDirPtr debugDir = boost::make_shared<DebugDir>(preparation.userSwitching.uid,
+			preparation.userSwitching.gid);
 		pid_t pid;
 
 		pid = syscalls::fork();
@@ -295,13 +291,13 @@ private:
 
 			PipeWatcherPtr watcher;
 
-			watcher = boost::make_shared<PipeWatcher>(adminSocket.second,
-				"stdout", pid);
+			watcher = boost::make_shared<PipeWatcher>(config,
+				adminSocket.second, "stdout", pid);
 			watcher->initialize();
 			watcher->start();
 
-			watcher = boost::make_shared<PipeWatcher>(errorPipe.first,
-				"stderr", pid);
+			watcher = boost::make_shared<PipeWatcher>(config,
+				errorPipe.first, "stderr", pid);
 			watcher->initialize();
 			watcher->start();
 
@@ -350,10 +346,11 @@ private:
 				"ruby_libdir: " + config->resourceLocator->getRubyLibDir() + "\n"
 				"passenger_version: " PASSENGER_VERSION "\n"
 				"UNIX_PATH_MAX: " + toString(UNIX_PATH_MAX) + "\n";
-			if (!details.options->groupSecret.empty()) {
-				data.append("connect_password: " + details.options->groupSecret + "\n");
+			if (!details.options->apiKey.empty()) {
+				data.append("connect_password: " + details.options->apiKey + "\n");
 			}
 			if (!config->instanceDir.empty()) {
+				data.append("instance_dir: " + config->instanceDir + "\n");
 				data.append("socket_dir: " + config->instanceDir + "/apps.s\n");
 			}
 
@@ -617,9 +614,31 @@ private:
 		return "";
 	}
 
-	SpawnResult sendSpawnCommand(const Options &options) {
+	NegotiationDetails sendSpawnCommandAndGetNegotiationDetails(const Options &options) {
+		TRACE_POINT();
+		NegotiationDetails details;
+
+		details.preparation = &preparation;
+		details.options = &options;
+
+		try {
+			sendSpawnCommand(details);
+		} catch (const SystemException &e) {
+			sendSpawnCommandAgain(e, details);
+		} catch (const IOException &e) {
+			sendSpawnCommandAgain(e, details);
+		} catch (const SpawnException &e) {
+			sendSpawnCommandAgain(e, details);
+		}
+
+		return details;
+	}
+
+	void sendSpawnCommand(NegotiationDetails &details) {
 		TRACE_POINT();
+		const Options &options = *details.options;
 		FileDescriptor fd;
+
 		try {
 			fd.assign(connectToServer(socketAddress, __FILE__, __LINE__), NULL, 0);
 		} catch (const SystemException &e) {
@@ -683,41 +702,34 @@ private:
 					DebugDirPtr());
 			}
 
-			SpawnResult result;
 			P_LOG_FILE_DESCRIPTOR_PURPOSE(fd, "App " << spawnedPid
 				<< " (" << options.appRoot << ") adminSocket[1]");
-			result.pid = spawnedPid;
-			result.adminSocket = fd;
-			result.io = io;
-			return result;
+			details.pid = spawnedPid;
+			details.adminSocket = fd;
+			details.io = io;
 
 		} else if (result == "Error\n") {
 			UPDATE_TRACE_POINT();
-			NegotiationDetails details;
 			details.io = io;
 			details.timeout = timeout;
 			handleSpawnErrorResponse(details);
 
 		} else {
 			UPDATE_TRACE_POINT();
-			NegotiationDetails details;
 			handleInvalidSpawnResponseType(result, details);
 		}
-
-		return SpawnResult(); // Never reached.
 	}
 
 	template<typename Exception>
-	SpawnResult sendSpawnCommandAgain(const Exception &e, const Options &options) {
+	void sendSpawnCommandAgain(const Exception &e, NegotiationDetails &details) {
 		TRACE_POINT();
 		P_WARN("An error occurred while spawning a process: " << e.what());
 		P_WARN("The application preloader seems to have crashed, restarting it and trying again...");
 		stopPreloader();
 		startPreloader();
 		ScopeGuard guard(boost::bind(&SmartSpawner::stopPreloader, this));
-		SpawnResult result = sendSpawnCommand(options);
+		sendSpawnCommand(details);
 		guard.clear();
-		return result;
 	}
 
 protected:
@@ -729,7 +741,7 @@ protected:
 public:
 	SmartSpawner(const vector<string> &_preloaderCommand,
 		const Options &_options,
-		const SpawnerConfigPtr &_config)
+		const ConfigPtr &_config)
 		: Spawner(_config),
 		  preloaderCommand(_preloaderCommand)
 	{
@@ -747,7 +759,7 @@ public:
 		stopPreloader();
 	}
 
-	virtual SpawnObject spawn(const Options &options) {
+	virtual Result spawn(const Options &options) {
 		TRACE_POINT();
 		assert(options.appType == this->options.appType);
 		assert(options.appRoot == this->options.appRoot);
@@ -767,28 +779,11 @@ public:
 		}
 
 		UPDATE_TRACE_POINT();
-		SpawnResult result;
-		try {
-			result = sendSpawnCommand(options);
-		} catch (const SystemException &e) {
-			result = sendSpawnCommandAgain(e, options);
-		} catch (const IOException &e) {
-			result = sendSpawnCommandAgain(e, options);
-		} catch (const SpawnException &e) {
-			result = sendSpawnCommandAgain(e, options);
-		}
-
-		UPDATE_TRACE_POINT();
-		NegotiationDetails details;
-		details.preparation = &preparation;
-		details.pid = result.pid;
-		details.adminSocket = result.adminSocket;
-		details.io = result.io;
-		details.options = &options;
-		SpawnObject object = negotiateSpawn(details);
+		NegotiationDetails details = sendSpawnCommandAndGetNegotiationDetails(options);
+		Result result = negotiateSpawn(details);
 		P_DEBUG("Process spawning done: appRoot=" << options.appRoot <<
-			", pid=" << object.process->pid);
-		return boost::move(object);
+			", pid=" << result["pid"].asInt());
+		return result;
 	}
 
 	virtual bool cleanable() const {
@@ -817,7 +812,7 @@ public:
 };
 
 
-} // namespace ApplicationPool2
+} // namespace SpawningKit
 } // namespace Passenger
 
-#endif /* _PASSENGER_APPLICATION_POOL2_SMART_SPAWNER_H_ */
+#endif /* _PASSENGER_SPAWNING_KIT_SMART_SPAWNER_H_ */