passenger 5.0.0.beta3 → 5.0.0.rc1

data/ext/common/ApplicationPool2/Spawner.h

@@ -390,7 +390,7 @@ private:
 				"gupid: " + details.gupid + "\n"
 				"UNIX_PATH_MAX: " + toString(UNIX_PATH_MAX) + "\n";
 			if (!details.options->groupSecret.empty()) {
-				"connect_password: " + details.options->groupSecret + "\n";
+				data.append("connect_password: " + details.options->groupSecret + "\n");
 			}
 			if (!config->instanceDir.empty()) {
 				data.append("socket_dir: " + config->instanceDir + "/apps.s\n");

data/ext/common/Constants.h

@@ -112,7 +112,7 @@
 
 	#define NGINX_DOC_URL "https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html"
 
-	#define PASSENGER_VERSION "5.0.0.beta3"
+	#define PASSENGER_VERSION "5.0.0.rc1"
 
 	#define POOL_HELPER_THREAD_STACK_SIZE 262144
 

data/ext/common/agents/Base.cpp

@@ -110,8 +110,12 @@ static unsigned int alternativeStackSize;
 static volatile unsigned int abortHandlerCalled = 0;
 static unsigned int randomSeed = 0;
 static char **origArgv = NULL;
+static const char *rubyLibDir = NULL;
+static const char *passengerRoot = NULL;
+static const char *defaultRuby = DEFAULT_RUBY;
 static const char *backtraceSanitizerCommand = NULL;
 static bool backtraceSanitizerPassProgramInfo = true;
+static const char *crashWatch = NULL;
 static DiagnosticsDumper customDiagnosticsDumper = NULL;
 static void *customDiagnosticsDumperUserData;
 
@@ -516,19 +520,15 @@ dumpWithCrashWatch(AbortHandlerState &state) {
 	pid_t child = asyncFork();
 	if (child == 0) {
 		closeAllFileDescriptors(2, true);
-		execlp("crash-watch", "crash-watch", "--dump", pidStr, (char * const) 0);
-		if (errno == ENOENT) {
-			safePrintErr("Crash-watch is not installed. Please install it with 'gem install crash-watch' "
-				"or download it from https://github.com/FooBarWidget/crash-watch.\n");
-		} else {
-			int e = errno;
-			end = messageBuf;
-			end = appendText(end, "crash-watch is installed, but it could not be executed! ");
-			end = appendText(end, "(execlp() returned errno=");
-			end = appendULL(end, e);
-			end = appendText(end, ") Please check your file permissions or something.\n");
-			write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
-		}
+		execlp(defaultRuby, defaultRuby, crashWatch, rubyLibDir,
+			passengerRoot, "--dump", pidStr, (char * const) 0);
+		int e = errno;
+		end = messageBuf;
+		end = appendText(end, "crash-watch is could not be executed! ");
+		end = appendText(end, "(execlp() returned errno=");
+		end = appendULL(end, e);
+		end = appendText(end, ") Please check your file permissions or something.\n");
+		write_nowarn(STDERR_FILENO, messageBuf, end - messageBuf);
 		_exit(1);
 
 	} else if (child == -1) {
@@ -1518,15 +1518,30 @@ initializeAgent(int argc, char **argv[], const char *processName,
 				argc - argStartIndex);
 		}
 
-		#ifdef __linux__
-			if (options.has("passenger_root")) {
-				ResourceLocator locator(options.get("passenger_root", true));
-				string ruby = options.get("default_ruby", false, DEFAULT_RUBY);
-				string path = ruby + " \"" + locator.getHelperScriptsDir() +
+		ResourceLocator locator;
+		string ruby;
+
+		if (options.has("passenger_root")) {
+			string path;
+			locator = ResourceLocator(options.get("passenger_root", true));
+			ruby = options.get("default_ruby", false, DEFAULT_RUBY);
+
+			rubyLibDir    = strdup(locator.getRubyLibDir().c_str());
+			passengerRoot = strdup(options.get("passenger_root", true).c_str());
+			defaultRuby   = strdup(ruby.c_str());
+
+			#ifdef __linux__
+				path = ruby + " \"" + locator.getHelperScriptsDir() +
 					"/backtrace-sanitizer.rb\"";
 				backtraceSanitizerCommand = strdup(path.c_str());
-			}
-		#endif
+			#endif
+
+			path = locator.getHelperScriptsDir() + "/crash-watch.rb";
+			crashWatch = strdup(path.c_str());
+		} else {
+			shouldDumpWithCrashWatch = false;
+		}
+
 		if (backtraceSanitizerCommand == NULL) {
 			backtraceSanitizerCommand = "c++filt -n";
 			backtraceSanitizerPassProgramInfo = false;

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

@@ -975,6 +975,7 @@ setAgentsOptionsDefaults() {
 	options.setDefaultInt("stat_throttle_rate", DEFAULT_STAT_THROTTLE_RATE);
 	options.setDefault("server_software", SERVER_TOKEN_NAME "/" PASSENGER_VERSION);
 	options.setDefaultBool("show_version_in_header", true);
+	options.setDefaultBool("sticky_sessions", false);
 	options.setDefault("sticky_sessions_cookie_name", DEFAULT_STICKY_SESSIONS_COOKIE_NAME);
 	options.setDefaultBool("turbocaching", true);
 	options.setDefault("data_buffer_dir", getSystemTempDir());
@@ -985,6 +986,7 @@ setAgentsOptionsDefaults() {
 	options.setDefaultBool("server_cpu_affine", false);
 	options.setDefault("friendly_error_pages", "auto");
 	options.setDefaultBool("rolling_restarts", false);
+	options.setDefaultBool("resist_deployment_errors", false);
 
 	string firstAddress = options.getStrSet("server_addresses")[0];
 	if (getSocketAddressType(firstAddress) == SAT_TCP) {
@@ -1000,6 +1002,7 @@ setAgentsOptionsDefaults() {
 	}
 
 	options.setDefault("default_ruby", DEFAULT_RUBY);
+	options.setDefaultBool("debugger", false);
 	if (!options.getBool("multi_app") && !options.has("app_root")) {
 		char *pwd = getcwd(NULL, 0);
 		options.set("app_root", pwd);
@@ -1024,7 +1027,7 @@ sanityCheckOptions() {
 	if (!options.getBool("multi_app") && options.has("app_type")) {
 		PassengerAppType appType = getAppType(options.get("app_type"));
 		if (appType == PAT_NONE || appType == PAT_ERROR) {
-			fprintf(stderr, "ERROR: '%s' is not a valid applicaion type. Supported app types are:",
+			fprintf(stderr, "ERROR: '%s' is not a valid application type. Supported app types are:",
 				options.get("app_type").c_str());
 			const AppTypeDefinition *definition = &appTypeDefinitions[0];
 			while (definition->type != PAT_NONE) {
@@ -1076,6 +1079,10 @@ sanityCheckOptions() {
 		fprintf(stderr, "ERROR: you may only specify for --threads a number greater than or equal to 1.\n");
 		ok = false;
 	}
+	if (options.getInt("max_pool_size") < 1) {
+		fprintf(stderr, "ERROR: you may only specify for --max-pool-size a number greater than or equal to 1.\n");
+		ok = false;
+	}
 
 	if (!ok) {
 		exit(1);

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

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -110,8 +110,11 @@ serverUsage() {
 	printf("                            Force friendly error pages to be always off\n");
 	printf("\n");
 	printf("      --ruby PATH           Default Ruby interpreter to use.\n");
+	printf("      --debugger            Enable Ruby debugger support (Enterprise only)\n");
 	printf("\n");
 	printf("      --rolling-restarts    Enable rolling restarts (Enterprise only)\n");
+	printf("      --resist-deployment-errors\n");
+	printf("                            Enable deployment error resistance (Enterprise only)\n");
 	printf("\n");
 	printf("Process management options (optional):\n");
 	printf("      --max-pool-size N     Maximum number of application processes.\n");
@@ -122,8 +125,10 @@ serverUsage() {
 	printf("      --min-instances N     Minimum number of application processes. Default: 1\n");
 	printf("\n");
 	printf("Request handling options (optional):\n");
+	printf("      --sticky-sessions    Enable sticky sessions\n");
 	printf("      --sticky-sessions-cookie-name NAME\n");
-	printf("                            Cookie name to use for sticky sessions\n");
+	printf("                            Cookie name to use for sticky sessions.\n");
+	printf("                            Default: " DEFAULT_STICKY_SESSIONS_COOKIE_NAME "\n");
 	printf("      --vary-turbocache-by-cookie NAME\n");
 	printf("                            Vary the turbocache by the cookie of the given name\n");
 	printf("      --disable-turbocaching\n");
@@ -263,10 +268,13 @@ parseServerOption(int argc, const char *argv[], int &i, VariantMap &options) {
 		options.setBool("multi_app", true);
 		i++;
 	} else if (p.isFlag(argv[i], '\0', "--force-friendly-error-pages")) {
-		options.set("friendly_error_pages", "true");
+		options.setBool("friendly_error_pages", true);
 		i++;
 	} else if (p.isFlag(argv[i], '\0', "--disable-friendly-error-pages")) {
-		options.set("friendly_error_pages", "false");
+		options.setBool("friendly_error_pages", false);
+		i++;
+	} else if (p.isFlag(argv[i], '\0', "--sticky-sessions")) {
+		options.setBool("sticky_sessions", true);
 		i++;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--sticky-sessions-cookie-name")) {
 		options.set("sticky_sessions_cookie_name", argv[i + 1]);
@@ -280,9 +288,15 @@ parseServerOption(int argc, const char *argv[], int &i, VariantMap &options) {
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--ruby")) {
 		options.set("default_ruby", argv[i + 1]);
 		i += 2;
+	} else if (p.isFlag(argv[i], '\0', "--debugger")) {
+		options.setBool("debugger", true);
+		i++;
 	} else if (p.isFlag(argv[i], '\0', "--rolling-restarts")) {
 		options.setBool("rolling_restarts", true);
 		i++;
+	} else if (p.isFlag(argv[i], '\0', "--resist-deployment-errors")) {
+		options.setBool("resist_deployment_errors", true);
+		i++;
 	} else if (p.isValueFlag(argc, i, argv[i], '\0', "--log-level")) {
 		// We do not set log_level because, when this function is called from
 		// the Watchdog, we don't want to affect the Watchdog's own log level.

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

@@ -23,89 +23,6 @@
  *  THE SOFTWARE.
  */
 
-/*
-   STAGES
-
-     Accept connect password
-              |
-             \|/
-          Read header
-              |
-             \|/
-       +------+------+
-       |             |
-       |             |
-      \|/            |
-     Buffer          |
-     request         |
-     body            |
-       |             |
-       |             |
-      \|/            |
-    Checkout <-------+
-    session
-       |
-       |
-      \|/
-  Send header
-    to app
-       |
-       |
-      \|/
-  Send request
-   body to app
-
-
-
-     OVERVIEW OF I/O CHANNELS, PIPES AND WATCHERS
-
-
-                             OPTIONAL:                                       appOutputWatcher
-                          clientBodyBuffer                                         (o)
-                                 |                                                  |
-    +----------+                 |             +-----------+                        |   +---------------+
-    |          |     ------ clientInput -----> |  Request  | ---------------->          |               |
-    |  Client  | fd                            |  Handler  |                    session |  Application  |
-    |          |     <--- clientOutputPipe --- |           | <--- appInput ---          |               |
-    +----------+ |                             +-----------+                            +---------------+
-                 |
-                (o)
-        clientOutputWatcher
-
-
-
-   REQUEST BODY HANDLING STRATEGIES
-
-   This table describes how we should handle the request body (the part in the request
-   that comes after the request header, and may include WebSocket data), given various
-   factors. Strategies that are listed first have precedence.
-
-    Method     'Upgrade'  'Content-Length' or   Application    Action
-               header     'Transfer-Encoding'   socket
-               present?   header present?       protocol
-    ---------------------------------------------------------------------------------------------
-
-    GET/HEAD   Y          Y                     -              Reject request[1]
-    Other      Y          -                     -              Reject request[2]
-
-    GET/HEAD   Y          N                     http_session   Set requestBodyLength=-1, keep socket open when done forwarding.
-    -          N          N                     http_session   Set requestBodyLength=0, keep socket open when done forwarding.
-    -          N          Y                     http_session   Keep socket open when done forwarding. If Transfer-Encoding is
-                                                               chunked, rechunck the body during forwarding.
-
-    GET/HEAD   Y          N                     session        Set requestBodyLength=-1, half-close app socket when done forwarding.
-    -          N          N                     session        Set requestBodyLength=0, half-close app socket when done forwarding.
-    -          N          Y                     session        Half-close app socket when done forwarding.
-    ---------------------------------------------------------------------------------------------
-
-    [1] Supporting situations in which there is both an HTTP request body and WebSocket data
-        is way too complicated. The RequestHandler code is complicated enough as it is,
-        so we choose not to support requests like these.
-    [2] RFC 6455 states that WebSocket upgrades may only happen over GET requests.
-        We don't bother supporting non-WebSocket upgrades.
-
- */
-
 #ifndef _PASSENGER_REQUEST_HANDLER_H_
 #define _PASSENGER_REQUEST_HANDLER_H_
 
@@ -193,6 +110,7 @@ private:
 	BenchmarkMode benchmarkMode: 3;
 	bool singleAppMode: 1;
 	bool showVersionInHeader: 1;
+	bool stickySessions: 1;
 	bool gracefulExit: 1;
 
 	const VariantMap *agentsOptions;
@@ -267,6 +185,7 @@ public:
 		  benchmarkMode(parseBenchmarkMode(_agentsOptions->get("benchmark_mode", false))),
 		  singleAppMode(false),
 		  showVersionInHeader(_agentsOptions->getBool("show_version_in_header")),
+		  stickySessions(_agentsOptions->getBool("sticky_sessions")),
 		  gracefulExit(_agentsOptions->getBool("server_graceful_exit")),
 
 		  agentsOptions(_agentsOptions),

data/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp

@@ -661,6 +661,59 @@ constructHeaderBuffersForResponse(Request *req, struct iovec *buffers,
 		}
 	}
 
+	if (req->stickySession) {
+		StaticString baseURI = req->options.baseURI;
+		if (baseURI.empty()) {
+			baseURI = P_STATIC_STRING("/");
+		}
+
+		// Note that we do NOT set HttpOnly. If we set that flag then Chrome
+		// doesn't send cookies over WebSocket handshakes. Confirmed on Chrome 25.
+
+		const LString *cookieName = getStickySessionCookieName(req);
+		unsigned int stickySessionId;
+		unsigned int stickySessionIdSize;
+		char *stickySessionIdStr;
+
+		PUSH_STATIC_BUFFER("Set-Cookie: ");
+
+		part = cookieName->start;
+		while (part != NULL) {
+			if (buffers != NULL) {
+				buffers[i].iov_base = (void *) part->data;
+				buffers[i].iov_len  = part->size;
+			}
+			dataSize += part->size;
+			INC_BUFFER_ITER(i);
+			part = part->next;
+		}
+
+		stickySessionId = req->session->getStickySessionId();
+		stickySessionIdSize = uintSizeAsString(stickySessionId);
+		stickySessionIdStr = (char *) psg_pnalloc(req->pool, stickySessionIdSize + 1);
+		uintToString(stickySessionId, stickySessionIdStr, stickySessionIdSize + 1);
+
+		PUSH_STATIC_BUFFER("=");
+
+		if (buffers != NULL) {
+			buffers[i].iov_base = stickySessionIdStr;
+			buffers[i].iov_len  = stickySessionIdSize;
+		}
+		dataSize += stickySessionIdSize;
+		INC_BUFFER_ITER(i);
+
+		PUSH_STATIC_BUFFER("; Path=");
+
+		if (buffers != NULL) {
+			buffers[i].iov_base = (void *) baseURI.data();
+			buffers[i].iov_len  = baseURI.size();
+		}
+		dataSize += baseURI.size();
+		INC_BUFFER_ITER(i);
+
+		PUSH_STATIC_BUFFER("\r\n");
+	}
+
 	if (showVersionInHeader) {
 		PUSH_STATIC_BUFFER("X-Powered-By: " PROGRAM_NAME " " PASSENGER_VERSION "\r\n\r\n");
 	} else {
@@ -683,7 +736,7 @@ constructDateHeaderBuffersForResponse(char *dateStr, unsigned int bufsize) {
 
 	pos = appendData(pos, end, "Date: ");
 	gmtime_r(&the_time, &the_tm);
-	pos += strftime(pos, end - pos, "%a, %d %b %Y %H:%M:%S %z", &the_tm);
+	pos += strftime(pos, end - pos, "%a, %d %b %Y %H:%M:%S GMT", &the_tm);
 	return pos - dateStr;
 }
 

data/ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp

@@ -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.
  *
@@ -49,7 +49,8 @@ onRequestBegin(Client *client, Request *req) {
 			: req->secureHeaders.lookupCell(PASSENGER_APP_GROUP_NAME);
 		analysis.unionStationSupport = unionStationCore != NULL
 			&& getBoolOption(req, UNION_STATION_SUPPORT, false);
-		req->stickySession = getBoolOption(req, PASSENGER_STICKY_SESSIONS, false);
+		req->stickySession = getBoolOption(req, PASSENGER_STICKY_SESSIONS,
+			this->stickySessions);
 		req->host = req->headers.lookup(HTTP_HOST);
 
 		/***************/
@@ -333,7 +334,10 @@ createNewPoolOptions(Client *client, Request *req, const HashedStaticString &app
 	if (appType == NULL || appType->size == 0) {
 		AppTypeDetector detector;
 		PassengerAppType type = detector.checkAppRoot(options.appRoot);
-		// TODO: check for errors
+		if (type == PAT_NONE || type == PAT_ERROR) {
+			disconnectWithError(&client, "client did not send a recognized !~PASSENGER_APP_TYPE header");
+			return;
+		}
 		options.appType = getAppTypeName(type);
 	} else {
 		fillPoolOption(req, options.appType, "!~PASSENGER_APP_TYPE");
@@ -358,7 +362,6 @@ createNewPoolOptions(Client *client, Request *req, const HashedStaticString &app
 	fillPoolOption(req, options.restartDir, "!~PASSENGER_RESTART_DIR");
 	fillPoolOption(req, options.startupFile, "!~PASSENGER_STARTUP_FILE");
 	fillPoolOption(req, options.loadShellEnvvars, "!~PASSENGER_LOAD_SHELL_ENVVARS");
-	fillPoolOption(req, options.debugger, "!~PASSENGER_DEBUGGER");
 	fillPoolOption(req, options.environmentVariables, "!~PASSENGER_ENV_VARS");
 	fillPoolOption(req, options.raiseInternalError, "!~PASSENGER_RAISE_INTERNAL_ERROR");
 	/******************/

data/ext/common/agents/Main.cpp

@@ -47,7 +47,7 @@ static void
 usage(int argc, char *argv[]) {
 	printf("Usage: " AGENT_EXE " <SUBCOMMAND> [options...]\n");
 	printf(PROGRAM_NAME " version " PASSENGER_VERSION ".\n");
-	printf("Type '%s help <SUBCOMMAND>' for help on a specific subcommand.\n",
+	printf("Type '%s <SUBCOMMAND> --help' for help on a specific subcommand.\n",
 		argv[0]);
 	printf("\n");
 	printf("Daemon subcommands:\n");

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

@@ -69,6 +69,7 @@
 #include <Hooks.h>
 #include <ResourceLocator.h>
 #include <Utils.h>
+#include <Utils/json.h>
 #include <Utils/Timer.h>
 #include <Utils/ScopeGuard.h>
 #include <Utils/StrIntUtils.h>
@@ -106,6 +107,7 @@ namespace WatchdogAgent {
 		uid_t defaultUid;
 		gid_t defaultGid;
 		InstanceDirectoryPtr instanceDir;
+		int reportFile;
 		int lockFile;
 		vector<string> cleanupPidfiles;
 		bool pidsCleanedUp;
@@ -118,7 +120,8 @@ namespace WatchdogAgent {
 		AdminServer *adminServer;
 
 		WorkingObjects()
-			: pidsCleanedUp(false),
+			: reportFile(-1),
+			  pidsCleanedUp(false),
 			  pidFileCleanedUp(false),
 			  bgloop(NULL),
 			  serverKitContext(NULL),
@@ -582,6 +585,8 @@ usage() {
 	printf("      --no-delete-pid-file    Do not delete PID file on exit\n");
 	printf("      --log-file PATH         Log to the given file.\n");
 	printf("      --log-level LEVEL       Logging level. [A] Default: %d\n", DEFAULT_LOG_LEVEL);
+	printf("      --report-file PATH      Upon successful initialization, report instance\n");
+	printf("                              information to the given file, in JSON format\n");
 	printf("      --cleanup-pidfile PATH  Upon shutdown, kill the process specified by\n");
 	printf("                              the given PID file\n");
 	printf("\n");
@@ -705,6 +710,9 @@ parseOptions(int argc, const char *argv[], VariantMap &options) {
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--log-level")) {
 			options.setInt("log_level", atoi(argv[i + 1]));
 			i += 2;
+		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--report-file")) {
+			options.set("report_file", argv[i + 1]);
+			i += 2;
 		} else if (p.isValueFlag(argc, i, argv[i], '\0', "--cleanup-pidfile")) {
 			vector<string> pidfiles = options.getStrSet("cleanup_pidfiles", false);
 			pidfiles.push_back(argv[i + 1]);
@@ -741,7 +749,7 @@ parseOptions(int argc, const char *argv[], VariantMap &options) {
 }
 
 static void
-initializeBareEssentials(int argc, char *argv[]) {
+initializeBareEssentials(int argc, char *argv[], WorkingObjectsPtr &wo) {
 	/*
 	 * Some Apache installations (like on OS X) redirect stdout to /dev/null,
 	 * so that only stderr is redirected to the log file. We therefore
@@ -767,6 +775,9 @@ initializeBareEssentials(int argc, char *argv[]) {
 
 	// Start all sub-agents with this environment variable.
 	setenv("PASSENGER_USE_FEEDBACK_FD", "true", 1);
+
+	wo = boost::make_shared<WorkingObjects>();
+	workingObjects = wo.get();
 }
 
 static void
@@ -815,7 +826,7 @@ static void
 redirectStdinToNull() {
 	int fd = open("/dev/null", O_RDONLY);
 	if (fd != -1) {
-		dup2(fd, 1);
+		dup2(fd, 0);
 		close(fd);
 	}
 }
@@ -829,10 +840,6 @@ maybeDaemonize() {
 		pid = fork();
 		if (pid == 0) {
 			setsid();
-			if (chdir("/") == -1) {
-				e = errno;
-				throw SystemException("Cannot change working directory to /", e);
-			}
 			redirectStdinToNull();
 		} else if (pid == -1) {
 			e = errno;
@@ -864,6 +871,21 @@ createPidFile() {
 	}
 }
 
+static void
+openReportFile(const WorkingObjectsPtr &wo) {
+	TRACE_POINT();
+	string reportFile = agentsOptions->get("report_file", false);
+	if (!reportFile.empty()) {
+		int fd = syscalls::open(reportFile.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0600);
+		if (fd == -1) {
+			int e = errno;
+			throw FileSystemException("Cannot open report file " + reportFile, e, reportFile);
+		}
+
+		wo->reportFile = fd;
+	}
+}
+
 static void
 lowerPrivilege() {
 	TRACE_POINT();
@@ -928,7 +950,7 @@ lookupDefaultUidGid(uid_t &uid, gid_t &gid) {
 }
 
 static void
-initializeWorkingObjects(WorkingObjectsPtr &wo, InstanceDirToucherPtr &instanceDirToucher) {
+initializeWorkingObjects(const WorkingObjectsPtr &wo, InstanceDirToucherPtr &instanceDirToucher) {
 	TRACE_POINT();
 	VariantMap &options = *agentsOptions;
 	vector<string> strset;
@@ -942,8 +964,6 @@ initializeWorkingObjects(WorkingObjectsPtr &wo, InstanceDirToucherPtr &instanceD
 			(" " SERVER_TOKEN_NAME "/" PASSENGER_VERSION));
 	}
 
-	wo = boost::make_shared<WorkingObjects>();
-	workingObjects = wo.get();
 	wo->resourceLocator = boost::make_shared<ResourceLocator>(agentsOptions->get("passenger_root"));
 
 	UPDATE_TRACE_POINT();
@@ -1171,17 +1191,30 @@ beginWatchingAgents(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watche
 
 static void
 reportAgentsInformation(const WorkingObjectsPtr &wo, const vector<AgentWatcherPtr> &watchers) {
+	TRACE_POINT();
+	VariantMap report;
+
+	report.set("instance_dir", wo->instanceDir->getPath());
+
+	foreach (AgentWatcherPtr watcher, watchers) {
+		watcher->reportAgentsInformation(report);
+	}
+
 	if (feedbackFdAvailable()) {
-		TRACE_POINT();
-		VariantMap report;
+		report.writeToFd(FEEDBACK_FD, "Agents information");
+	}
 
-		report.set("instance_dir", wo->instanceDir->getPath());
+	if (wo->reportFile != -1) {
+		Json::Value doc;
+		VariantMap::ConstIterator it;
+		string str;
 
-		foreach (AgentWatcherPtr watcher, watchers) {
-			watcher->reportAgentsInformation(report);
+		for (it = report.begin(); it != report.end(); it++) {
+			doc[it->first] = it->second;
 		}
+		str = doc.toStyledString();
 
-		report.writeToFd(FEEDBACK_FD, "Agents information");
+		writeExact(wo->reportFile, str.data(), str.size());
 	}
 }
 
@@ -1214,12 +1247,13 @@ cleanup(const WorkingObjectsPtr &wo) {
 
 int
 watchdogMain(int argc, char *argv[]) {
-	initializeBareEssentials(argc, argv);
+	WorkingObjectsPtr wo;
+
+	initializeBareEssentials(argc, argv, wo);
 	setAgentsOptionsDefaults();
 	sanityCheckOptions();
 	P_NOTICE("Starting " AGENT_EXE " watchdog...");
 	P_DEBUG("Watchdog options: " << agentsOptions->inspect());
-	WorkingObjectsPtr wo;
 	InstanceDirToucherPtr instanceDirToucher;
 	vector<AgentWatcherPtr> watchers;
 
@@ -1228,6 +1262,7 @@ watchdogMain(int argc, char *argv[]) {
 		maybeSetsid();
 		maybeDaemonize();
 		createPidFile();
+		openReportFile(wo);
 		lowerPrivilege();
 		initializeWorkingObjects(wo, instanceDirToucher);
 		initializeAgentWatchers(wo, watchers);
@@ -1280,7 +1315,7 @@ watchdogMain(int argc, char *argv[]) {
 			P_DEBUG("Web server did not exit gracefully, forcing shutdown of all agents...");
 		}
 		UPDATE_TRACE_POINT();
-		runHookScriptAndThrowOnError("after_watchdog_shutdown");
+		runHookScriptAndThrowOnError("before_watchdog_shutdown");
 		UPDATE_TRACE_POINT();
 		AgentWatcher::stopWatching(watchers);
 		if (shouldExitGracefully) {