passenger 4.0.60 → 5.0.0.beta1

data/ext/common/AgentsStarter.h

@@ -1,6 +1,6 @@
 /*
  *  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.
  *
@@ -72,10 +72,9 @@ int pp_agents_starter_start(PP_AgentsStarter *as,
 	const PP_AfterForkCallback afterFork,
 	void *callbackArgument,
 	char **errorMessage);
-const char *pp_agents_starter_get_request_socket_filename(PP_AgentsStarter *as, unsigned int *size);
-const char *pp_agents_starter_get_request_socket_password(PP_AgentsStarter *as, unsigned int *size);
-const char *pp_agents_starter_get_server_instance_dir(PP_AgentsStarter *as);
-const char *pp_agents_starter_get_generation_dir(PP_AgentsStarter *as);
+const char *pp_agents_starter_get_server_address(PP_AgentsStarter *as, unsigned int *size);
+const char *pp_agents_starter_get_server_password(PP_AgentsStarter *as, unsigned int *size);
+const char *pp_agents_starter_get_instance_dir(PP_AgentsStarter *as, unsigned int *size);
 pid_t       pp_agents_starter_get_pid(PP_AgentsStarter *as);
 void        pp_agents_starter_detach(PP_AgentsStarter *as);
 void        pp_agents_starter_free(PP_AgentsStarter *as);
@@ -99,7 +98,6 @@ void        pp_agents_starter_free(PP_AgentsStarter *as);
 #include <Constants.h>
 #include <FileDescriptor.h>
 #include <MessageClient.h>
-#include <ServerInstanceDir.h>
 #include <Exceptions.h>
 #include <ResourceLocator.h>
 #include <Logging.h>
@@ -132,26 +130,17 @@ private:
 	 /** The watchdog's feedback file descriptor. */
 	FileDescriptor feedbackFd;
 
-	/** The helper agent's request socket filename and its password. This socket
-	 * is for serving SCGI requests. */
-	string requestSocketFilename;
-	string requestSocketPassword;
-
-	/** The socket on which the helper agent listens for administration commands,
-	 * and the corresponding password for the "web_server" account, which has the
-	 * authorization to shutdown the helper agent.
+	/** The address on which the Phusion Passenger HTTP server listens, and the
+	 * corresponding password.
 	 */
-	string helperAgentAdminSocketAddress;
-	string helperAgentExitPassword;
+	string serverAddress;
+	string serverPassword;
 
 	/** The logging agent's socket address and its password. */
-	string loggingSocketAddress;
-	string loggingSocketPassword;
+	string loggingAgentAddress;
+	string loggingAgentPassword;
 
-	/** The server instance dir and generation dir of the agents. */
-	ServerInstanceDirPtr serverInstanceDir;
-	/** The generation dir of the agents. */
-	ServerInstanceDir::GenerationPtr generation;
+	string instanceDir;
 
 	/**
 	 * Safely dup2() the given file descriptor to 3 (FEEDBACK_FD).
@@ -194,26 +183,26 @@ private:
 		if (ret == 0) {
 			/* Looks like the watchdog didn't crash and is still running. */
 			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
+				"Unable to start the " PROGRAM_NAME " watchdog: "
 				"it froze during startup and reported an unknown error");
 		} else if (ret != -1 && WIFSIGNALED(status)) {
 			/* Looks like a crash which caused a signal. */
 			pid = -1;
 			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
+				"Unable to start the " PROGRAM_NAME " watchdog: "
 				"it seems to have been killed with signal " +
 				getSignalName(WTERMSIG(status)) + " during startup");
 		} else if (ret == -1) {
 			/* Looks like it exited for a different reason and has no exit code. */
 			pid = -1;
 			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
+				"Unable to start the " PROGRAM_NAME " watchdog: "
 				"it seems to have crashed during startup for an unknown reason");
 		} else {
 			/* Looks like it exited for a different reason, but has an exit code. */
 			pid = -1;
 			throw RuntimeException(
-				"Unable to start the Phusion Passenger watchdog: "
+				"Unable to start the " PROGRAM_NAME " watchdog: "
 				"it seems to have crashed during startup for an unknown reason, "
 				"with exit code " + toString(WEXITSTATUS(status)));
 		}
@@ -247,35 +236,12 @@ private:
 		return 0; // timed out
 	}
 
-	/**
-	 * Gracefully shutdown an agent process by sending an exit command to its socket.
-	 * Returns whether the agent has successfully processed the exit command.
-	 * Any exceptions are caught and will cause false to be returned.
-	 */
-	bool gracefullyShutdownAgent(const string &address, const string &username,
-		const string &password)
-	{
-		try {
-			MessageClient client;
-			vector<string> args;
-
-			client.connect(address, username, password);
-			client.write("exit", NULL);
-			return client.read(args) && args[0] == "Passed security" &&
-			       client.read(args) && args[0] == "exit command received";
-		} catch (const SystemException &) {
-		} catch (const IOException &) {
-		} catch (const SecurityException &) {
-		}
-		return false;
-	}
-
 public:
 	/**
 	 * Construct a AgentsStarter object. The watchdog and the agents
 	 * aren't started yet until you call start().
 	 *
-	 * @param type Whether one wants to start the Apache or the Nginx helper agent.
+	 * @param type Whether the start process is Apache or Nginx.
 	 */
 	AgentsStarter(PP_AgentsStarterType type) {
 		this->type = type;
@@ -285,39 +251,17 @@ public:
 	~AgentsStarter() {
 		if (pid != 0) {
 			this_thread::disable_syscall_interruption dsi;
-			bool cleanShutdown = gracefullyShutdownAgent(helperAgentAdminSocketAddress,
-				"_web_server", helperAgentExitPassword);
-			cleanShutdown = cleanShutdown &&
-				gracefullyShutdownAgent(loggingSocketAddress,
-					"logging", loggingSocketPassword);
 
 			/* Send a message down the feedback fd to tell the watchdog
-			 * Whether this is a clean shutdown. Closing the fd without
-			 * sending anything also indicates an unclean shutdown,
-			 * but we send a byte anyway in case there are other processes
-			 * who have the fd open.
+			 * that we're shutting down cleanly. Closing the fd without
+			 * sending anything indicates an unclean shutdown.
 			 */
-			if (cleanShutdown) {
-				syscalls::write(feedbackFd, "c", 1);
-			} else {
-				syscalls::write(feedbackFd, "u", 1);
-			}
-
-			/* If we failed to send an exit command to one of the agents then we have
-			 * to forcefully kill all agents now because otherwise one of them might
-			 * never exit. We do this by closing the feedback fd without sending a
-			 * random byte, to indicate that this is an abnormal shutdown. The watchdog
-			 * will then kill all agents.
-			 */
-
+			syscalls::write(feedbackFd, "c", 1);
 			feedbackFd.close();
 			syscalls::waitpid(pid, NULL, 0);
 		}
 	}
 
-	/**
-	 * Returns the type as was passed to the constructor.
-	 */
 	PP_AgentsStarterType getType() const {
 		return type;
 	}
@@ -332,36 +276,24 @@ public:
 
 	// The 'const string &' here is on purpose. The C getter functions
 	// return the string pointer directly.
-	const string &getRequestSocketFilename() const {
-		return requestSocketFilename;
-	}
-
-	const string &getRequestSocketPassword() const {
-		return requestSocketPassword;
+	const string &getServerAddress() const {
+		return serverAddress;
 	}
 
-	string getHelperAgentAdminSocketFilename() const {
-		return parseUnixSocketAddress(helperAgentAdminSocketAddress);
+	const string &getServerPassword() const {
+		return serverPassword;
 	}
 
-	string getHelperAgentExitPassword() const {
-		return helperAgentExitPassword;
+	const string &getLoggingAgentAddress() const {
+		return loggingAgentAddress;
 	}
 
-	string getLoggingSocketAddress() const {
-		return loggingSocketAddress;
+	const string &getLoggingAgentPassword() const {
+		return loggingAgentPassword;
 	}
 
-	string getLoggingSocketPassword() const {
-		return loggingSocketPassword;
-	}
-
-	ServerInstanceDirPtr getServerInstanceDir() const {
-		return serverInstanceDir;
-	}
-
-	ServerInstanceDir::GenerationPtr getGeneration() const {
-		return generation;
+	const string &getInstanceDir() const {
+		return instanceDir;
 	}
 
 	/**
@@ -380,7 +312,7 @@ public:
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		ResourceLocator locator(passengerRoot);
-		string watchdogFilename = locator.getAgentsDir() + "/PassengerWatchdog";
+		string agentFilename = locator.findSupportBinary(AGENT_EXE);
 		SocketPair fds;
 		int e;
 		pid_t pid;
@@ -391,8 +323,7 @@ public:
 			.setPid ("web_server_pid",  getpid())
 			.set    ("web_server_passenger_version", PASSENGER_VERSION)
 			.set    ("passenger_root",  passengerRoot)
-			.setInt ("log_level",       getLogLevel())
-			.set    ("temp_dir",        getSystemTempDir());
+			.setInt ("log_level",       getLogLevel());
 		extraParams.addTo(params);
 
 		fds = createUnixSocketPair();
@@ -421,11 +352,16 @@ public:
 			installFeedbackFd(fds[1]);
 			closeAllFileDescriptors(FEEDBACK_FD);
 
+			setenv("PASSENGER_USE_FEEDBACK_FD", "true", 1);
+
 			if (afterFork) {
 				afterFork();
 			}
 
-			execl(watchdogFilename.c_str(), "PassengerWatchdog", (char *) 0);
+			execl(agentFilename.c_str(), AGENT_EXE, "watchdog",
+				// Some extra space to allow the child process to change its process title.
+				"                                                ",
+				(char *) 0);
 			e = errno;
 			try {
 				writeArrayMessage(FEEDBACK_FD,
@@ -435,7 +371,7 @@ public:
 				_exit(1);
 			} catch (...) {
 				fprintf(stderr, "Passenger AgentsStarter: could not execute %s: %s (%d)\n",
-					watchdogFilename.c_str(), strerror(e), e);
+					agentFilename.c_str(), strerror(e), e);
 				fflush(stderr);
 				_exit(1);
 			}
@@ -484,7 +420,7 @@ public:
 				} else {
 					killProcessGroupAndWait(&pid, 5000);
 					guard.clear();
-					throw SystemException("Unable to start the Phusion Passenger watchdog: "
+					throw SystemException("Unable to start the " PROGRAM_NAME " watchdog: "
 						"unable to read its startup information report",
 						ex.code());
 				}
@@ -496,7 +432,7 @@ public:
 
 			if (args[0] == "Agents information") {
 				if ((args.size() - 1) % 2 != 0) {
-					throw RuntimeException("Unable to start the Phusion Passenger watchdog "
+					throw RuntimeException("Unable to start the " PROGRAM_NAME " watchdog "
 						"because it sent an invalid startup information report (the number "
 						"of items is not an even number)");
 				}
@@ -510,19 +446,16 @@ public:
 
 				this->pid        = pid;
 				this->feedbackFd = feedbackFd;
-				requestSocketFilename   = info.get("request_socket_filename");
-				requestSocketPassword   = info.get("request_socket_password");
-				helperAgentAdminSocketAddress = info.get("helper_agent_admin_socket_address");
-				helperAgentExitPassword       = info.get("helper_agent_exit_password");
-				serverInstanceDir = boost::make_shared<ServerInstanceDir>(info.get("server_instance_dir"), false);
-				generation        = serverInstanceDir->getGeneration(info.getInt("generation"));
-				loggingSocketAddress  = info.get("logging_socket_address");
-				loggingSocketPassword = info.get("logging_socket_password");
+				serverAddress    = info.get("server_address");
+				serverPassword   = info.get("server_password");
+				instanceDir      = info.get("instance_dir");
+				loggingAgentAddress  = info.get("logging_agent_address");
+				loggingAgentPassword = info.get("logging_agent_password");
 				guard.clear();
 			} else if (args[0] == "Watchdog startup error") {
 				killProcessGroupAndWait(&pid, 5000);
 				guard.clear();
-				throw RuntimeException("Unable to start the Phusion Passenger watchdog "
+				throw RuntimeException("Unable to start the " PROGRAM_NAME " watchdog "
 					"because it encountered the following error during startup: " +
 					args[1]);
 			} else if (args[0] == "system error") {
@@ -543,24 +476,25 @@ public:
 						passengerRootConfig = "passenger_root";
 						docURL = NGINX_DOC_URL "#PassengerRoot";
 					}
-					throw RuntimeException("Unable to start the Phusion Passenger watchdog "
-						"because its executable (" + watchdogFilename + ") does "
-						"not exist. This probably means that your Phusion Passenger "
+					throw RuntimeException("Unable to start the " PROGRAM_NAME " watchdog "
+						"because its executable (" + agentFilename + ") does "
+						"not exist. This probably means that your " PROGRAM_NAME " "
 						"installation is broken or incomplete, or that your '" +
 						passengerRootConfig + "' directive is set to the wrong value. "
-						"Please reinstall Phusion Passenger or fix your '" +
+						"Please reinstall " PROGRAM_NAME " or fix your '" +
 						passengerRootConfig + "' directive, whichever is applicable. "
 						"To learn how to fix '" + passengerRootConfig + "', please read " +
 						docURL);
 				} else {
-					throw SystemException("Unable to start the Phusion Passenger watchdog (" +
-						watchdogFilename + ")", e);
+					throw SystemException("Unable to start the " PROGRAM_NAME " watchdog (" +
+						agentFilename + ")", e);
 				}
 			} else {
 				UPDATE_TRACE_POINT();
 				killProcessGroupAndWait(&pid, 5000);
 				guard.clear();
-				throw RuntimeException("The Phusion Passenger watchdog sent an unknown feedback message '" + args[0] + "'");
+				throw RuntimeException("The " PROGRAM_NAME " watchdog sent an unknown feedback message '"
+					+ args[0] + "'");
 			}
 		}
 	}

data/ext/common/ApplicationPool2/AppTypes.cpp

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013 Phusion
+ *  Copyright (c) 2013-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -37,9 +37,8 @@ namespace ApplicationPool2 {
  * - The Developer Guide, section "Executing the loader or preloader"
  */
 const AppTypeDefinition appTypeDefinitions[] = {
-	{ PAT_RACK, "rack", "config.ru", "Passenger RackApp" },
+	{ PAT_RACK, "rack", "config.ru", "Passenger RubyApp" },
 	{ PAT_WSGI, "wsgi", "passenger_wsgi.py", "Passenger WsgiApp" },
-	{ PAT_CLASSIC_RAILS, "classic-rails", "config/environment.rb", "Passenger ClassicRailsApp" },
 	{ PAT_NODE, "node", "app.js", "Passenger NodeApp" },
 	{ PAT_METEOR, "meteor", ".meteor", "Passenger MeteorApp" },
 	{ PAT_NONE, NULL, NULL, NULL }
@@ -53,9 +52,9 @@ using namespace Passenger;
 using namespace Passenger::ApplicationPool2;
 
 PP_AppTypeDetector *
-pp_app_type_detector_new() {
+pp_app_type_detector_new(unsigned int throttleRate) {
 	try {
-		return new AppTypeDetector();
+		return new AppTypeDetector(NULL, NULL, throttleRate);
 	} catch (const std::bad_alloc &) {
 		return 0;
 	}
@@ -66,6 +65,14 @@ pp_app_type_detector_free(PP_AppTypeDetector *detector) {
 	delete (AppTypeDetector *) detector;
 }
 
+void
+pp_app_type_detector_set_throttle_rate(PP_AppTypeDetector *_detector,
+	unsigned int throttleRate)
+{
+	AppTypeDetector *detector = (AppTypeDetector *) _detector;
+	detector->setThrottleRate(throttleRate);
+}
+
 PassengerAppType
 pp_app_type_detector_check_document_root(PP_AppTypeDetector *_detector,
 	const char *documentRoot, unsigned int len, int resolveFirstSymlink,

data/ext/common/ApplicationPool2/AppTypes.h

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2013 Phusion
+ *  Copyright (c) 2013-2014 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -43,7 +43,6 @@ extern "C" {
 typedef enum {
 	PAT_RACK,
 	PAT_WSGI,
-	PAT_CLASSIC_RAILS,
 	PAT_NODE,
 	PAT_METEOR,
 	PAT_NONE,
@@ -52,8 +51,10 @@ typedef enum {
 
 typedef void PP_AppTypeDetector;
 
-PP_AppTypeDetector *pp_app_type_detector_new();
+PP_AppTypeDetector *pp_app_type_detector_new(unsigned int throttleRate);
 void pp_app_type_detector_free(PP_AppTypeDetector *detector);
+void pp_app_type_detector_set_throttle_rate(PP_AppTypeDetector *detector,
+	unsigned int throttleRate);
 PassengerAppType pp_app_type_detector_check_document_root(PP_AppTypeDetector *detector,
 	const char *documentRoot, unsigned int len, int resolveFirstSymlink,
 	PP_Error *error);
@@ -71,6 +72,7 @@ PassengerAppType pp_get_app_type2(const char *name, unsigned int len);
 #ifdef __cplusplus
 #include <oxt/macros.hpp>
 #include <oxt/backtrace.hpp>
+#include <boost/thread.hpp>
 #include <cstdlib>
 #include <limits.h>
 #include <string>
@@ -99,6 +101,7 @@ extern const AppTypeDefinition appTypeDefinitions[];
 class AppTypeDetector {
 private:
 	CachedFileStat *cstat;
+	boost::mutex *cstatMutex;
 	unsigned int throttleRate;
 	bool ownsCstat;
 
@@ -112,20 +115,20 @@ private:
 			TRACE_POINT();
 			throw RuntimeException("Not enough buffer space");
 		}
-		return getFileType(StaticString(buf, pos - buf), cstat, throttleRate) != FT_NONEXISTANT;
+		return getFileType(StaticString(buf, pos - buf), cstat, cstatMutex, throttleRate) != FT_NONEXISTANT;
 	}
 
 public:
-	AppTypeDetector() {
-		cstat = new CachedFileStat();
-		ownsCstat = true;
-		throttleRate = 1;
-	}
-
-	AppTypeDetector(CachedFileStat *_cstat, unsigned int _throttleRate) {
-		cstat = _cstat;
-		ownsCstat = false;
-		throttleRate = _throttleRate;
+	AppTypeDetector(CachedFileStat *_cstat = NULL, boost::mutex *_cstatMutex = NULL, unsigned int _throttleRate = 1)
+		: cstat(_cstat),
+		  cstatMutex(_cstatMutex),
+		  throttleRate(_throttleRate),
+		  ownsCstat(false)
+	{
+		if (_cstat == NULL) {
+			cstat = new CachedFileStat();
+			ownsCstat = true;
+		}
 	}
 
 	~AppTypeDetector() {
@@ -134,6 +137,10 @@ public:
 		}
 	}
 
+	void setThrottleRate(unsigned int val) {
+		throttleRate = val;
+	}
+
 	/**
 	 * Given a web server document root (that is, some subdirectory under the
 	 * application root, e.g. "/webapps/foobar/public"), returns the type of