passenger 3.9.2.beta → 4.0.0.rc4

data/ext/common/agents/SpawnPreparer.cpp

@@ -159,6 +159,13 @@ main(int argc, char *argv[]) {
 	setGivenEnvVars(envvars);
 	dumpInformation();
 	
+	// Print a newline just in case whatever executed us printed data
+	// without a newline. Otherwise the next process's "!> I have control"
+	// command will not be properly recognized.
+	// https://code.google.com/p/phusion-passenger/issues/detail?id=842#c16
+	printf("\n");
+	fflush(stdout);
+
 	execvp(executable, (char * const *) execArgs);
 	int e = errno;
 	fprintf(stderr, "*** ERROR ***: Cannot execute %s: %s (%d)\n",

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

@@ -26,6 +26,8 @@
 #include <oxt/system_calls.hpp>
 #include <boost/function.hpp>
 #include <boost/bind.hpp>
+#include <boost/make_shared.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <string>
 
 #include <sys/select.h>
@@ -63,7 +65,6 @@ using namespace Passenger;
 
 /** The options that were passed to AgentsStarter. */
 static VariantMap     agentsOptions;
-static unsigned int   logLevel;
 static pid_t   webServerPid;
 static string  tempDir;
 static bool    userSwitching;
@@ -72,10 +73,6 @@ static string  defaultGroup;
 static uid_t   webServerWorkerUid;
 static gid_t   webServerWorkerGid;
 static string  passengerRoot;
-static string  rubyCommand;
-static unsigned int maxPoolSize;
-static unsigned int maxInstancesPerApp;
-static unsigned int poolIdleTime;
 static string  serializedPrestartURLs;
 
 static string oldOomScore;
@@ -95,12 +92,12 @@ static void setOomScore(const StaticString &score);
 /**
  * Abstract base class for watching agent processes.
  */
-class AgentWatcher {
+class AgentWatcher: public enable_shared_from_this<AgentWatcher> {
 private:
 	/** The watcher thread. */
 	oxt::thread *thr;
 	
-	void threadMain() {
+	void threadMain(shared_ptr<AgentWatcher> self) {
 		try {
 			pid_t pid, ret;
 			int status, e;
@@ -510,12 +507,12 @@ public:
 			throw RuntimeException("Already started watching.");
 		}
 		
-		thr = new oxt::thread(boost::bind(&AgentWatcher::threadMain, this),
+		thr = new oxt::thread(boost::bind(&AgentWatcher::threadMain, this, shared_from_this()),
 			name(), 256 * 1024);
 	}
 	
-	static void stopWatching(vector<AgentWatcher *> &watchers) {
-		vector<AgentWatcher *>::const_iterator it;
+	static void stopWatching(vector< shared_ptr<AgentWatcher> > &watchers) {
+		vector< shared_ptr<AgentWatcher> >::const_iterator it;
 		oxt::thread *threads[watchers.size()];
 		unsigned int i = 0;
 		
@@ -524,6 +521,10 @@ public:
 		}
 		
 		oxt::thread::interrupt_and_join_multiple(threads, watchers.size());
+		for (it = watchers.begin(); it != watchers.end(); it++, i++) {
+			delete (*it)->thr;
+			(*it)->thr = NULL;
+		}
 	}
 	
 	/**
@@ -570,6 +571,8 @@ public:
 	}
 };
 
+typedef shared_ptr<AgentWatcher> AgentWatcherPtr;
+
 
 class HelperAgentWatcher: public AgentWatcher {
 protected:
@@ -880,7 +883,7 @@ setOomScoreNeverKill() {
  * an error.
  */
 static bool
-waitForStarterProcessOrWatchers(vector<AgentWatcher *> &watchers) {
+waitForStarterProcessOrWatchers(vector<AgentWatcherPtr> &watchers) {
 	fd_set fds;
 	int max, ret;
 	char x;
@@ -903,7 +906,7 @@ waitForStarterProcessOrWatchers(vector<AgentWatcher *> &watchers) {
 	}
 	
 	if (FD_ISSET(errorEvent->fd(), &fds)) {
-		vector<AgentWatcher *>::const_iterator it;
+		vector<AgentWatcherPtr>::const_iterator it;
 		string message, backtrace, watcherName;
 		
 		for (it = watchers.begin(); it != watchers.end() && message.empty(); it++) {
@@ -926,7 +929,7 @@ waitForStarterProcessOrWatchers(vector<AgentWatcher *> &watchers) {
 }
 
 static void
-cleanupAgentsInBackground(vector<AgentWatcher *> &watchers) {
+cleanupAgentsInBackground(vector<AgentWatcherPtr> &watchers) {
 	this_thread::disable_interruption di;
 	this_thread::disable_syscall_interruption dsi;
 	pid_t pid;
@@ -935,13 +938,15 @@ cleanupAgentsInBackground(vector<AgentWatcher *> &watchers) {
 	pid = fork();
 	if (pid == 0) {
 		// Child
-		vector<AgentWatcher *>::const_iterator it;
+		vector<AgentWatcherPtr>::const_iterator it;
 		Timer timer(false);
 		fd_set fds, fds2;
 		int max, agentProcessesDone;
 		unsigned long long deadline = 30000; // miliseconds
 		
-		// Wait until all agent processes have exited.
+		// Wait until all agent processes have exited. The starter
+		// process is responsible for telling the individual agents
+		// to exit.
 		
 		max = 0;
 		FD_ZERO(&fds);
@@ -1010,14 +1015,35 @@ cleanupAgentsInBackground(vector<AgentWatcher *> &watchers) {
 }
 
 static void
-forceAllAgentsShutdown(vector<AgentWatcher *> &watchers) {
-	vector<AgentWatcher *>::iterator it;
+forceAllAgentsShutdown(vector<AgentWatcherPtr> &watchers) {
+	vector<AgentWatcherPtr>::iterator it;
 	
 	for (it = watchers.begin(); it != watchers.end(); it++) {
 		(*it)->forceShutdown();
 	}
 }
 
+static string
+inferDefaultGroup(const string &defaultUser) {
+	struct passwd *userEntry = getpwnam(defaultUser.c_str());
+	if (userEntry == NULL) {
+		throw ConfigurationException(
+			string("The user that PassengerDefaultUser refers to, '") +
+			defaultUser + "', does not exist.");
+	}
+	
+	struct group *groupEntry = getgrgid(userEntry->pw_gid);
+	if (groupEntry == NULL) {
+		throw ConfigurationException(
+			string("The option PassengerDefaultUser is set to '" +
+			defaultUser + "', but its primary group doesn't exist. "
+			"In other words, your system's user account database "
+			"is broken. Please fix it."));
+	}
+	
+	return groupEntry->gr_name;
+}
+
 int
 main(int argc, char *argv[]) {
 	/*
@@ -1040,33 +1066,52 @@ main(int argc, char *argv[]) {
 	oldOomScore = setOomScoreNeverKill();
 	
 	agentsOptions = initializeAgent(argc, argv, "PassengerWatchdog");
-	logLevel      = agentsOptions.getInt("log_level");
-	webServerPid  = agentsOptions.getPid("web_server_pid");
-	tempDir       = agentsOptions.get("temp_dir");
-	userSwitching = agentsOptions.getBool("user_switching");
-	defaultUser   = agentsOptions.get("default_user");
-	defaultGroup  = agentsOptions.get("default_group");
-	webServerWorkerUid = agentsOptions.getUid("web_server_worker_uid");
-	webServerWorkerGid = agentsOptions.getGid("web_server_worker_gid");
-	passengerRoot = agentsOptions.get("passenger_root");
-	rubyCommand   = agentsOptions.get("ruby");
-	maxPoolSize        = agentsOptions.getInt("max_pool_size");
-	maxInstancesPerApp = agentsOptions.getInt("max_instances_per_app");
-	poolIdleTime       = agentsOptions.getInt("pool_idle_time");
-	serializedPrestartURLs  = agentsOptions.get("prestart_urls");
-	
+	agentsOptions
+		.setDefaultInt ("log_level", DEFAULT_LOG_LEVEL)
+		.setDefault    ("temp_dir", getSystemTempDir())
+
+		.setDefaultBool("user_switching", true)
+		.setDefault    ("default_user", DEFAULT_WEB_APP_USER)
+		.setDefaultUid ("web_server_worker_uid", getuid())
+		.setDefaultGid ("web_server_worker_gid", getgid())
+		.setDefault    ("ruby", DEFAULT_RUBY)
+		.setDefault    ("python", DEFAULT_PYTHON)
+		.setDefaultInt ("max_pool_size", DEFAULT_MAX_POOL_SIZE)
+		.setDefaultInt ("max_instances_per_app", DEFAULT_MAX_INSTANCES_PER_APP)
+		.setDefaultInt ("pool_idle_time", DEFAULT_POOL_IDLE_TIME);
+
 	P_DEBUG("Starting Watchdog...");
 	
 	try {
+		TRACE_POINT();
+		// Required options
+		passengerRoot = agentsOptions.get("passenger_root");
+		webServerPid  = agentsOptions.getPid("web_server_pid");
+
+		// Optional options
+		UPDATE_TRACE_POINT();
+		tempDir       = agentsOptions.get("temp_dir");
+		userSwitching = agentsOptions.getBool("user_switching");
+		defaultUser   = agentsOptions.get("default_user");
+		if (!agentsOptions.has("default_group")) {
+			agentsOptions.set("default_group", inferDefaultGroup(defaultUser));
+		}
+		defaultGroup       = agentsOptions.get("default_group");
+		webServerWorkerUid = agentsOptions.getUid("web_server_worker_uid");
+		webServerWorkerGid = agentsOptions.getGid("web_server_worker_gid");
+
+		UPDATE_TRACE_POINT();
 		randomGenerator = new RandomGenerator();
 		errorEvent = new EventFd();
 		
+		UPDATE_TRACE_POINT();
 		serverInstanceDir.reset(new ServerInstanceDir(webServerPid, tempDir));
 		generation = serverInstanceDir->newGeneration(userSwitching, defaultUser,
 			defaultGroup, webServerWorkerUid, webServerWorkerGid);
 		agentsOptions.set("server_instance_dir", serverInstanceDir->getPath());
 		agentsOptions.setInt("generation_number", generation->getNumber());
 		
+		UPDATE_TRACE_POINT();
 		ServerInstanceDirToucher serverInstanceDirToucher;
 		ResourceLocator resourceLocator(passengerRoot);
 		if (agentsOptions.get("analytics_server", false).empty()) {
@@ -1078,16 +1123,21 @@ main(int argc, char *argv[]) {
 			loggingAgentAddress = agentsOptions.get("analytics_server");
 		}
 		
-		HelperAgentWatcher helperAgentWatcher(resourceLocator);
-		LoggingAgentWatcher loggingAgentWatcher(resourceLocator);
+		UPDATE_TRACE_POINT();
+		shared_ptr<HelperAgentWatcher> helperAgentWatcher =
+			make_shared<HelperAgentWatcher>(resourceLocator);
+		shared_ptr<LoggingAgentWatcher> loggingAgentWatcher =
+			make_shared<LoggingAgentWatcher>(resourceLocator);
 		
-		vector<AgentWatcher *> watchers;
-		vector<AgentWatcher *>::iterator it;
-		watchers.push_back(&helperAgentWatcher);
+		UPDATE_TRACE_POINT();
+		vector<AgentWatcherPtr> watchers;
+		vector<AgentWatcherPtr>::iterator it;
+		watchers.push_back(helperAgentWatcher);
 		if (agentsOptions.get("analytics_server", false).empty()) {
-			watchers.push_back(&loggingAgentWatcher);
+			watchers.push_back(loggingAgentWatcher);
 		}
 		
+		UPDATE_TRACE_POINT();
 		for (it = watchers.begin(); it != watchers.end(); it++) {
 			try {
 				(*it)->start();
@@ -1101,6 +1151,7 @@ main(int argc, char *argv[]) {
 			}
 			// Allow other exceptions to propagate and crash the watchdog.
 		}
+		UPDATE_TRACE_POINT();
 		for (it = watchers.begin(); it != watchers.end(); it++) {
 			try {
 				(*it)->startWatching();
@@ -1115,21 +1166,25 @@ main(int argc, char *argv[]) {
 			// Allow other exceptions to propagate and crash the watchdog.
 		}
 		
+		UPDATE_TRACE_POINT();
 		writeArrayMessage(FEEDBACK_FD,
 			"Basic startup info",
 			serverInstanceDir->getPath().c_str(),
 			toString(generation->getNumber()).c_str(),
 			NULL);
 		
+		UPDATE_TRACE_POINT();
 		for (it = watchers.begin(); it != watchers.end(); it++) {
 			(*it)->sendStartupInfo(FEEDBACK_FD);
 		}
 		
+		UPDATE_TRACE_POINT();
 		writeArrayMessage(FEEDBACK_FD, "All agents started", NULL);
 		P_DEBUG("All Phusion Passenger agents started!");
 		
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
+		UPDATE_TRACE_POINT();
 		bool exitGracefully = waitForStarterProcessOrWatchers(watchers);
 		if (exitGracefully) {
 			/* Fork a child process which cleans up all the agent processes in
@@ -1140,11 +1195,14 @@ main(int argc, char *argv[]) {
 		} else {
 			P_DEBUG("Web server did not exit gracefully, forcing shutdown of all agents...");
 		}
+		UPDATE_TRACE_POINT();
 		AgentWatcher::stopWatching(watchers);
 		if (exitGracefully) {
+			UPDATE_TRACE_POINT();
 			cleanupAgentsInBackground(watchers);
 			return 0;
 		} else {
+			UPDATE_TRACE_POINT();
 			forceAllAgentsShutdown(watchers);
 			return 1;
 		}

data/ext/nginx/Configuration.c

@@ -57,11 +57,6 @@ static ngx_path_init_t  ngx_http_proxy_temp_path = {
 };
 
 
-static int
-ngx_str_equals(ngx_str_t *str, const char *value) {
-    return ngx_memn2cmp(str->data, (u_char *) value, str->len, strlen(value)) == 0;
-}
-
 void *
 passenger_create_main_conf(ngx_conf_t *cf)
 {
@@ -95,8 +90,6 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->union_station_gateway_cert.len = 0;
     conf->union_station_proxy_address.data = NULL;
     conf->union_station_proxy_address.len = 0;
-    conf->union_station_proxy_type.data = NULL;
-    conf->union_station_proxy_type.len = 0;
     
     conf->prestart_uris = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
     if (conf->prestart_uris == NULL) {
@@ -209,14 +202,6 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         conf->union_station_proxy_address.data = (u_char *) "";
     }
     
-    if (conf->union_station_proxy_type.len == 0) {
-        conf->union_station_proxy_type.data = (u_char *) "";
-        
-    } else if (!ngx_str_equals(&conf->union_station_proxy_type, "http")
-            && !ngx_str_equals(&conf->union_station_proxy_type, "socks5")) {
-        return "union_station_proxy_type may only be 'http' or 'socks5'.";
-    }
-    
     return NGX_CONF_OK;
 }
 
@@ -253,6 +238,8 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->show_version_in_header = NGX_CONF_UNSET;
     conf->ruby.data = NULL;
     conf->ruby.len = 0;
+    conf->python.data = NULL;
+    conf->python.len = 0;
     conf->environment.data = NULL;
     conf->environment.len = 0;
     conf->spawn_method.data = NULL;
@@ -265,6 +252,8 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->group.len = 0;
     conf->app_group_name.data = NULL;
     conf->app_group_name.len = 0;
+    conf->app_root.data = NULL;
+    conf->app_root.len = 0;
     conf->app_rights.data = NULL;
     conf->app_rights.len = 0;
     conf->base_uris = NGX_CONF_UNSET_PTR;
@@ -365,12 +354,14 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_value(conf->debugger, prev->debugger, 0);
     ngx_conf_merge_value(conf->show_version_in_header, prev->show_version_in_header, 1);
     ngx_conf_merge_str_value(conf->ruby, prev->ruby, NULL);
+    ngx_conf_merge_str_value(conf->python, prev->python, NULL);
     ngx_conf_merge_str_value(conf->environment, prev->environment, "production");
     ngx_conf_merge_str_value(conf->spawn_method, prev->spawn_method, "smart");
     ngx_conf_merge_str_value(conf->union_station_key, prev->union_station_key, NULL);
     ngx_conf_merge_str_value(conf->user, prev->user, "");
     ngx_conf_merge_str_value(conf->group, prev->group, "");
     ngx_conf_merge_str_value(conf->app_group_name, prev->app_group_name, NULL);
+    ngx_conf_merge_str_value(conf->app_root, prev->app_root, NULL);
     ngx_conf_merge_str_value(conf->app_rights, prev->app_rights, NULL);
     ngx_conf_merge_value(conf->min_instances, prev->min_instances, (ngx_int_t) -1);
     ngx_conf_merge_value(conf->max_requests, prev->max_requests, (ngx_int_t) -1);
@@ -1054,6 +1045,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_loc_conf_t, ruby),
       NULL },
 
+    { ngx_string("passenger_python"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, python),
+      NULL },
+
     { ngx_string("passenger_log_level"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,
@@ -1068,6 +1066,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, debug_log_file),
       NULL },
 
+    { ngx_string("passenger_temp_dir"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, temp_dir),
+      NULL },
+
     { ngx_string("passenger_abort_on_startup_error"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_FLAG,
       ngx_conf_set_flag_slot,
@@ -1165,6 +1170,12 @@ const ngx_command_t passenger_commands[] = {
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(passenger_loc_conf_t, app_group_name),
       NULL },
+    { ngx_string("passenger_app_root"),
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
+      ngx_conf_set_str_slot,
+      NGX_HTTP_LOC_CONF_OFFSET,
+      offsetof(passenger_loc_conf_t, app_root),
+      NULL },
 
     { ngx_string("passenger_app_rights"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
@@ -1222,13 +1233,6 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, union_station_proxy_address),
       NULL },
 
-    { ngx_string("union_station_proxy_type"),
-      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
-      ngx_conf_set_str_slot,
-      NGX_HTTP_MAIN_CONF_OFFSET,
-      offsetof(passenger_main_conf_t, union_station_proxy_type),
-      NULL },
-
     { ngx_string("union_station_filter"),
       NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
       union_station_filter,

data/ext/nginx/Configuration.h

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010, 2011, 2012 Phusion
+ * Copyright (C) 2010-2013 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -45,11 +45,13 @@ typedef struct {
     ngx_flag_t   debugger;
     ngx_flag_t   show_version_in_header;
     ngx_str_t    ruby;
+    ngx_str_t    python;
     ngx_str_t    environment;
     ngx_str_t    user;
     ngx_str_t    group;
     ngx_str_t    spawn_method;
     ngx_str_t    app_group_name;
+    ngx_str_t    app_root;
     ngx_str_t    app_rights;
     ngx_int_t    min_instances;
     ngx_int_t    max_requests;
@@ -69,6 +71,7 @@ typedef struct {
     ngx_str_t    root_dir;
     ngx_int_t    log_level;
     ngx_str_t    debug_log_file;
+    ngx_str_t    temp_dir;
     ngx_flag_t   abort_on_startup_error;
     ngx_uint_t   max_pool_size;
     ngx_uint_t   max_instances_per_app;
@@ -82,7 +85,6 @@ typedef struct {
     ngx_uint_t   union_station_gateway_port;
     ngx_str_t    union_station_gateway_cert;
     ngx_str_t    union_station_proxy_address;
-    ngx_str_t    union_station_proxy_type;
     ngx_array_t *prestart_uris;
 } passenger_main_conf_t;