passenger 4.0.48 → 4.0.49

data/ext/common/agents/Base.cpp

@@ -217,7 +217,7 @@ appendULL(char *buf, unsigned long long value) {
 		remainder = remainder / 10;
 		size++;
 	} while (remainder != 0);
-	
+
 	reverse(buf, size);
 	return buf + size;
 }
@@ -228,13 +228,13 @@ static char *
 appendIntegerAsHex(char *buf, IntegerType value) {
 	IntegerType remainder = value;
 	unsigned int size = 0;
-	
+
 	do {
 		buf[size] = hex_chars[remainder % 16];
 		remainder = remainder / 16;
 		size++;
 	} while (remainder != 0);
-	
+
 	reverse(buf, size);
 	return buf + size;
 }
@@ -298,7 +298,7 @@ appendSignalName(char *buf, int signo) {
 static char *
 appendSignalReason(char *buf, siginfo_t *info) {
 	bool handled = true;
-	
+
 	switch (info->si_code) {
 	SI_CODE_HANDLER(SI_USER);
 	#ifdef SI_KERNEL
@@ -359,7 +359,7 @@ appendSignalReason(char *buf, siginfo_t *info) {
 		}
 		break;
 	}
-	
+
 	if (info->si_code <= 0) {
 		buf = appendText(buf, ", signal sent by PID ");
 		buf = appendULL(buf, (unsigned long long) info->si_pid);
@@ -369,7 +369,7 @@ appendSignalReason(char *buf, siginfo_t *info) {
 
 	buf = appendText(buf, ", si_addr=");
 	buf = appendPointerAsString(buf, info->si_addr);
-	
+
 	return buf;
 }
 
@@ -514,7 +514,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 	char *end = messageBuf;
 	end = appendULL(end, (unsigned long long) state.pid);
 	*end = '\0';
-	
+
 	pid_t child = asyncFork();
 	if (child == 0) {
 		closeAllFileDescriptors(2, true);
@@ -584,7 +584,7 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 				close(p[1]);
 				dup2(p[0], STDIN_FILENO);
 				closeAllFileDescriptors(2, true);
-				
+
 				char *command = end;
 				end = appendText(end, "exec ");
 				end = appendText(end, backtraceSanitizerCommand);
@@ -1046,7 +1046,7 @@ abortHandler(int signo, siginfo_t *info, void *ctx) {
 	 * We work around this for anything in the same linkage unit by just definin
 	 * our own versions of the assert handler and abort.
 	 */
-	
+
 	#include <pthread.h>
 
 	extern "C" int
@@ -1093,7 +1093,7 @@ installAbortHandler() {
 		fflush(stderr);
 		abort();
 	}
-	
+
 	stack_t stack;
 	stack.ss_sp = alternativeStack;
 	stack.ss_size = alternativeStackSize;
@@ -1105,7 +1105,7 @@ installAbortHandler() {
 		fflush(stderr);
 		abort();
 	}
-	
+
 	struct sigaction action;
 	action.sa_sigaction = abortHandler;
 	action.sa_flags = SA_RESETHAND | SA_SIGINFO;
@@ -1406,7 +1406,7 @@ initializeSyscallFailureSimulation(const char *processName) {
 	string prefix = string(processName) + "=";
 	vector<string> components;
 	unsigned int i;
-	
+
 	// Lookup this process in the specification string.
 	split(spec, ';', components);
 	for (i = 0; i < components.size(); i++) {
@@ -1495,7 +1495,7 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 	}
 	srand(randomSeed);
 	srandom(randomSeed);
-	
+
 	ignoreSigpipe();
 	if (hasEnvOption("PASSENGER_ABORT_HANDLER", true)) {
 		shouldDumpWithCrashWatch = hasEnvOption("PASSENGER_DUMP_WITH_CRASH_WATCH", true);
@@ -1512,7 +1512,7 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 	}
 	setvbuf(stdout, NULL, _IONBF, 0);
 	setvbuf(stderr, NULL, _IONBF, 0);
-	
+
 	TRACE_POINT();
 	try {
 		if (argc == 1) {
@@ -1544,7 +1544,7 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 		} else {
 			options.readFrom((const char **) argv + 1, argc - 1);
 		}
-		
+
 		#ifdef __linux__
 			if (options.has("passenger_root")) {
 				ResourceLocator locator(options.get("passenger_root", true));
@@ -1569,14 +1569,14 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 				 */
 				string filename = options.get("debug_log_file");
 				options.erase("debug_log_file");
-				
+
 				int fd = open(filename.c_str(), O_CREAT | O_WRONLY | O_APPEND, 0644);
 				if (fd == -1) {
 					int e = errno;
 					throw FileSystemException("Cannot open debug log file " +
 						filename, e, filename);
 				}
-				
+
 				dup2(fd, STDOUT_FILENO);
 				dup2(fd, STDERR_FILENO);
 				close(fd);
@@ -1588,7 +1588,7 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
 		exit(1);
 	}
-	
+
 	// Change process title.
 	argv0 = strdup(argv[0]);
 	strncpy(argv[0], processName, strlen(argv[0]));
@@ -1597,7 +1597,7 @@ initializeAgent(int argc, char *argv[], const char *processName) {
 	}
 
 	P_DEBUG("Random seed: " << randomSeed);
-	
+
 	return options;
 }
 

data/ext/common/agents/HelperAgent/AgentOptions.h

@@ -94,7 +94,7 @@ struct AgentOptions: public VariantMap {
 		loggingAgentAddress   = options.get("logging_agent_address");
 		loggingAgentPassword  = options.get("logging_agent_password");
 		adminToolStatusPassword = options.get("admin_tool_status_password");
-		
+
 		// Optional options.
 		prestartUrls          = options.getStrSet("prestart_urls", false);
 		requestSocketLink     = options.get("request_socket_link", false);

data/ext/common/agents/HelperAgent/FileBackedPipe.h

@@ -276,7 +276,7 @@ private:
 				);
 			}
 			break;
-		
+
 		case OPENING_FILE:
 			file.writeBuffer.append(data, size);
 			break;
@@ -285,7 +285,7 @@ private:
 			file.writeBuffer.append(data, size);
 			writeBufferToFile();
 			break;
-		
+
 		default:
 			abort();
 		}
@@ -418,7 +418,7 @@ private:
 		if (OXT_UNLIKELY(oldGeneration != generation)) {
 			throw RuntimeException("Don't call the consumed callback after you've reset the FileBackedPipe!");
 		}
-		
+
 		if (pthread_equal(pthread_self(), getLibev()->getCurrentThread())) {
 			real_dataConsumed(consumed, done, oldGeneration);
 		} else {
@@ -516,7 +516,7 @@ private:
 				}
 			}
 			break;
-		
+
 		default:
 			abort();
 		}
@@ -571,7 +571,7 @@ public:
 	~FileBackedPipe() {
 		delete[] memory.data;
 	}
-	
+
 	bool resetable() const {
 		//return dataState == IN_MEMORY;
 		return true;
@@ -614,7 +614,7 @@ public:
 			return (ssize_t) file.writtenSize
 				- file.readOffset
 				+ file.writeBuffer.size();
-		
+
 		default:
 			abort();
 		}

data/ext/common/agents/HelperAgent/Main.cpp

@@ -83,17 +83,17 @@ class RemoteController: public MessageServer::Handler {
 private:
 	struct SpecificContext: public MessageServer::ClientContext {
 	};
-	
+
 	typedef MessageServer::CommonClientContext CommonClientContext;
-	
+
 	boost::shared_ptr<RequestHandler> requestHandler;
 	PoolPtr pool;
-	
-	
+
+
 	/*********************************************
 	 * Message handler methods
 	 *********************************************/
-	
+
 	void processDetachProcess(CommonClientContext &commonContext, SpecificContext *specificContext,
 		const vector<string> &args)
 	{
@@ -114,7 +114,7 @@ private:
 		// TODO: implement this
 		writeArrayMessage(commonContext.fd, "false", NULL);
 	}
-	
+
 	bool processInspect(CommonClientContext &commonContext, SpecificContext *specificContext,
 		const vector<string> &args)
 	{
@@ -128,7 +128,7 @@ private:
 		writeScalarMessage(commonContext.fd, pool->inspect(Pool::InspectOptions(options)));
 		return true;
 	}
-	
+
 	void processToXml(CommonClientContext &commonContext, SpecificContext *specificContext,
 		const vector<string> &args)
 	{
@@ -173,17 +173,17 @@ private:
 		requestHandler->inspect(stream);
 		writeScalarMessage(commonContext.fd, stream.str());
 	}
-	
+
 public:
 	RemoteController(const boost::shared_ptr<RequestHandler> &requestHandler, const PoolPtr &pool) {
 		this->requestHandler = requestHandler;
 		this->pool = pool;
 	}
-	
+
 	virtual MessageServer::ClientContextPtr newClient(CommonClientContext &commonContext) {
 		return boost::make_shared<SpecificContext>();
 	}
-	
+
 	virtual bool processMessage(CommonClientContext &commonContext,
 	                            MessageServer::ClientContextPtr &_specificContext,
 	                            const vector<string> &args)
@@ -219,12 +219,12 @@ public:
 class ExitHandler: public MessageServer::Handler {
 private:
 	EventFd &exitEvent;
-	
+
 public:
 	ExitHandler(EventFd &_exitEvent)
 		: exitEvent(_exitEvent)
 	{ }
-	
+
 	virtual bool processMessage(MessageServer::CommonClientContext &commonContext,
 	                            MessageServer::ClientContextPtr &handlerSpecificContext,
 	                            const vector<string> &args)
@@ -252,10 +252,10 @@ class Server {
 private:
 	static const int MESSAGE_SERVER_THREAD_STACK_SIZE = 128 * 1024;
 	static const int EVENT_LOOP_THREAD_STACK_SIZE = 256 * 1024;
-	
+
 	FileDescriptor feedbackFd;
 	const AgentOptions &options;
-	
+
 	BackgroundEventLoop poolLoop;
 	BackgroundEventLoop requestLoop;
 
@@ -264,6 +264,7 @@ private:
 	ServerInstanceDir::GenerationPtr generation;
 	UnionStation::CorePtr unionStationCore;
 	RandomGeneratorPtr randomGenerator;
+	SpawnerConfigPtr spawnerConfig;
 	SpawnerFactoryPtr spawnerFactory;
 	PoolPtr pool;
 	ev::sig sigquitWatcher;
@@ -275,7 +276,7 @@ private:
 	boost::shared_ptr<oxt::thread> messageServerThread;
 	boost::shared_ptr<oxt::thread> eventLoopThread;
 	EventFd exitEvent;
-	
+
 	/**
 	 * Starts listening for client connections on this server's request socket.
 	 *
@@ -285,7 +286,7 @@ private:
 	void startListening() {
 		this_thread::disable_syscall_interruption dsi;
 		requestSocket = createUnixServer(getRequestSocketFilename().c_str());
-		
+
 		int ret, e;
 		do {
 			ret = chmod(getRequestSocketFilename().c_str(), S_ISVTX |
@@ -334,7 +335,7 @@ private:
 			}
 		}
 	}
-	
+
 	/**
 	 * Lowers this process's privilege to that of <em>username</em> and <em>groupname</em>.
 	 */
@@ -342,7 +343,7 @@ private:
 		struct passwd *userEntry;
 		gid_t gid;
 		int e;
-		
+
 		userEntry = getpwnam(username.c_str());
 		if (userEntry == NULL) {
 			throw NonExistentUserException(string("Unable to lower Passenger "
@@ -355,7 +356,7 @@ private:
 				"HelperAgent's privilege to that of user '") + username +
 				"': user does not exist.");
 		}
-		
+
 		if (initgroups(username.c_str(), userEntry->pw_gid) != 0) {
 			e = errno;
 			throw SystemException(string("Unable to lower Passenger HelperAgent's "
@@ -377,7 +378,7 @@ private:
 
 		setenv("HOME", userEntry->pw_dir, 1);
 	}
-	
+
 	void onSigquit(ev::sig &signal, int revents) {
 		requestHandler->inspect(cerr);
 		cerr.flush();
@@ -402,7 +403,7 @@ private:
 		self->requestHandler->inspect(cerr);
 		cerr << "\n";
 		cerr.flush();
-		
+
 		cerr << "### Pool state (simple)\n";
 		// Do not lock, the crash may occur within the pool.
 		Pool::InspectOptions options;
@@ -420,7 +421,7 @@ private:
 		cerr << oxt::thread::all_backtraces();
 		cerr.flush();
 	}
-	
+
 public:
 	Server(FileDescriptor feedbackFd, const AgentOptions &_options)
 		: options(_options),
@@ -430,7 +431,7 @@ public:
 	{
 		TRACE_POINT();
 		this->feedbackFd = feedbackFd;
-		
+
 		UPDATE_TRACE_POINT();
 		generation = serverInstanceDir.getGeneration(options.generationNumber);
 		startListening();
@@ -442,10 +443,10 @@ public:
 		accountsDatabase->add("_web_server", options.exitPassword, false, Account::EXIT);
 		messageServer = boost::make_shared<MessageServer>(
 			parseUnixSocketAddress(options.adminSocketAddress), accountsDatabase);
-		
+
 		createFile(generation->getPath() + "/helper_agent.pid",
 			toString(getpid()), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-		
+
 		if (geteuid() == 0 && !options.userSwitching) {
 			lowerPrivilege(options.defaultUser, options.defaultGroup);
 		}
@@ -458,18 +459,18 @@ public:
 			throw RuntimeException("Your random number device, /dev/urandom, appears to be broken. "
 				"It doesn't seem to be returning random data. Please fix this.");
 		}
-		
+
 		UPDATE_TRACE_POINT();
 		unionStationCore = boost::make_shared<UnionStation::Core>(options.loggingAgentAddress,
 			"logging", options.loggingAgentPassword);
-		spawnerFactory = boost::make_shared<SpawnerFactory>(generation,
-			boost::make_shared<SpawnerConfig>(resourceLocator, unionStationCore,
-				randomGenerator));
+		spawnerConfig = boost::make_shared<SpawnerConfig>(resourceLocator, unionStationCore,
+				randomGenerator, &options);
+		spawnerFactory = boost::make_shared<SpawnerFactory>(generation, spawnerConfig);
 		pool = boost::make_shared<Pool>(spawnerFactory, &options);
 		pool->initialize();
 		pool->setMax(options.maxPoolSize);
 		pool->setMaxIdleTime(options.poolIdleTime * 1000000);
-		
+
 		requestHandler = boost::make_shared<RequestHandler>(requestLoop.safe,
 			requestSocket, pool, options);
 
@@ -480,14 +481,14 @@ public:
 		sigquitWatcher.set(SIGQUIT);
 		sigquitWatcher.set<Server, &Server::onSigquit>(this);
 		sigquitWatcher.start();
-		
+
 		UPDATE_TRACE_POINT();
 		writeArrayMessage(feedbackFd,
 			"initialized",
 			getRequestSocketFilename().c_str(),
 			messageServer->getSocketFilename().c_str(),
 			NULL);
-		
+
 		boost::function<void ()> func = boost::bind(prestartWebApps,
 			resourceLocator,
 			options.defaultRubyCommand,
@@ -497,18 +498,18 @@ public:
 			boost::bind(runAndPrintExceptions, func, true)
 		));
 	}
-	
+
 	~Server() {
 		TRACE_POINT();
 		this_thread::disable_syscall_interruption dsi;
 		this_thread::disable_interruption di;
-		
+
 		P_DEBUG("Shutting down helper agent...");
 		prestarterThread->interrupt_and_join();
 		if (messageServerThread != NULL) {
 			messageServerThread->interrupt_and_join();
 		}
-		
+
 		messageServer.reset();
 		P_DEBUG("Destroying application pool...");
 		pool->destroy();
@@ -538,10 +539,10 @@ public:
 				syscalls::unlink(options.requestSocketLink.c_str());
 			}
 		}
-		
+
 		P_TRACE(2, "All threads have been shut down.");
 	}
-	
+
 	void mainLoop() {
 		TRACE_POINT();
 		boost::function<void ()> func;
@@ -551,7 +552,7 @@ public:
 			boost::bind(runAndPrintExceptions, func, true),
 			"MessageServer thread", MESSAGE_SERVER_THREAD_STACK_SIZE
 		));
-		
+
 		poolLoop.start("Pool event loop", 0);
 		requestLoop.start("Request event loop", 0);
 
@@ -562,7 +563,7 @@ public:
 		this_thread::disable_syscall_interruption dsi;
 		fd_set fds;
 		int largestFd;
-		
+
 		FD_ZERO(&fds);
 		FD_SET(feedbackFd, &fds);
 		FD_SET(exitEvent.fd(), &fds);
@@ -574,7 +575,7 @@ public:
 			uninstallDiagnosticsDumper();
 			throw SystemException("select() failed", e);
 		}
-		
+
 		if (FD_ISSET(feedbackFd, &fds)) {
 			/* If the watchdog has been killed then we'll kill all descendant
 			 * processes and exit. There's no point in keeping this helper
@@ -641,20 +642,20 @@ main(int argc, char *argv[]) {
 
 	P_DEBUG("Starting PassengerHelperAgent...");
 	MultiLibeio::init();
-	
+
 	try {
 		UPDATE_TRACE_POINT();
 		Server server(FileDescriptor(FEEDBACK_FD), *options);
 		P_WARN("PassengerHelperAgent online, listening at unix:" <<
 			server.getRequestSocketFilename());
-		
+
 		UPDATE_TRACE_POINT();
 		server.mainLoop();
 	} catch (const tracable_exception &e) {
 		P_ERROR("*** ERROR: " << e.what() << "\n" << e.backtrace());
 		return 1;
 	}
-	
+
 	MultiLibeio::shutdown();
 	P_TRACE(2, "Helper agent exiting with code 0.");
 	return 0;