passenger 3.0.6 → 3.0.7

data/NEWS

@@ -1,3 +1,24 @@
+Release 3.0.7
+-------------
+
+ * Fixed a bug passenger-install-apache2-module. It could crash on
+   some systems due to a typo in the code.
+ * Upgraded preferred Nginx version to 1.0.0.
+ * Phusion Passenger Standalone now pre-starts application processes
+   at startup instead of doing that at the first request.
+ * When sending data to Union Station, the HTTP status code is now also
+   logged.
+ * Various Union Station-related stability improvements.
+ * The Linux OOM killer was previously erroneously disabled for all
+   Phusion Passenger processes, including application processes. The
+   intention was to only disable it for the Watchdog. This has been
+   fixed, and the Watchdog is now the only process for which the OOM
+   killer is disabled.
+ * Fixed some compilation problems on OpenBSD.
+ * Due to a typo, the dependency on file-tail was not entirely removed
+   in 3.0.6. This has now been fixed.
+
+
 Release 3.0.6
 -------------
 

data/build/agents.rb

@@ -45,7 +45,6 @@ dependencies = [
 	'ext/common/LoggingAgent/Main.cpp',
 	'ext/common/LoggingAgent/LoggingServer.h',
 	'ext/common/LoggingAgent/RemoteSender.h',
-	'ext/common/LoggingAgent/ChangeNotifier.h',
 	'ext/common/LoggingAgent/DataStoreId.h',
 	'ext/common/LoggingAgent/FilterSupport.h',
 	'ext/common/ServerInstanceDir.h',

data/build/cxx_tests.rb

@@ -132,7 +132,6 @@ TEST_CXX_OBJECTS = {
 		test/cxx/LoggingTest.cpp
 		ext/common/LoggingAgent/LoggingServer.h
 		ext/common/LoggingAgent/RemoteSender.h
-		ext/common/LoggingAgent/ChangeNotifier.h
 		ext/common/LoggingAgent/DataStoreId.h
 		ext/common/LoggingAgent/FilterSupport.h
 		ext/common/Logging.h

data/doc/Users guide Apache.html

@@ -4514,7 +4514,7 @@ has no effect.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-12-05 20:52:52 CET
+Last updated 2011-04-06 13:32:49 CEST
 </div>
 </div>
 </body>

data/doc/cxxapi/Constants_8h_source.html

@@ -51,7 +51,7 @@
 <a name="l00026"></a>00026 <span class="preprocessor"></span><span class="preprocessor">#define _PASSENGER_CONSTANTS_H_</span>
 <a name="l00027"></a>00027 <span class="preprocessor"></span>
 <a name="l00028"></a>00028 <span class="comment">/* Don&#39;t forget to update lib/phusion_passenger.rb too. */</span>
-<a name="l00029"></a>00029 <span class="preprocessor">#define PASSENGER_VERSION &quot;3.0.6&quot;</span>
+<a name="l00029"></a>00029 <span class="preprocessor">#define PASSENGER_VERSION &quot;3.0.7&quot;</span>
 <a name="l00030"></a>00030 <span class="preprocessor"></span>
 <a name="l00031"></a>00031 <span class="preprocessor">#define FEEDBACK_FD 3</span>
 <a name="l00032"></a>00032 <span class="preprocessor"></span>

data/doc/cxxapi/StaticContentHandler_8h_source.html

@@ -53,13 +53,14 @@
 <a name="l00028"></a>00028 <span class="preprocessor">#ifndef _PASSENGER_NGINX_STATIC_CONTENT_HANDLER_H_</span>
 <a name="l00029"></a>00029 <span class="preprocessor"></span><span class="preprocessor">#define _PASSENGER_NGINX_STATIC_CONTENT_HANDLER_H_</span>
 <a name="l00030"></a>00030 <span class="preprocessor"></span>
-<a name="l00031"></a>00031 <span class="preprocessor">#include &lt;ngx_core.h&gt;</span>
-<a name="l00032"></a>00032 <span class="preprocessor">#include &lt;ngx_http.h&gt;</span>
-<a name="l00033"></a>00033 
-<a name="l00034"></a>00034 ngx_int_t passenger_static_content_handler(ngx_http_request_t *r,
-<a name="l00035"></a>00035                                            ngx_str_t *filename);
-<a name="l00036"></a>00036 
-<a name="l00037"></a>00037 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_NGINX_STATIC_CONTENT_HANDLER_H_ */</span>
+<a name="l00031"></a>00031 <span class="preprocessor">#include &lt;ngx_config.h&gt;</span>
+<a name="l00032"></a>00032 <span class="preprocessor">#include &lt;ngx_core.h&gt;</span>
+<a name="l00033"></a>00033 <span class="preprocessor">#include &lt;ngx_http.h&gt;</span>
+<a name="l00034"></a>00034 
+<a name="l00035"></a>00035 ngx_int_t passenger_static_content_handler(ngx_http_request_t *r,
+<a name="l00036"></a>00036                                            ngx_str_t *filename);
+<a name="l00037"></a>00037 
+<a name="l00038"></a>00038 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_NGINX_STATIC_CONTENT_HANDLER_H_ */</span>
 </pre></div></div>
 <hr size="1"/><address style="text-align: right;"><small>Generated by&nbsp;
 <a href="http://www.doxygen.org/index.html">

data/doc/cxxapi/group__Core.html

@@ -26,7 +26,7 @@ Collaboration diagram for Core Apache-related classes and functions:</div>
 <div class="dynsection">
 <center><table><tr><td><img src="group__Core.png" border="0" alt="" usemap="#group____Core_map"/>
 <map name="group____Core_map" id="group____Core">
-<area shape="rect" id="node2" href="group__Hooks.html" title="Apache hooks" alt="" coords="349,5,461,35"/></map></td></tr></table></center>
+<area shape="rect" id="node2" href="group__Hooks.html" title="Apache hooks" alt="" coords="303,5,399,33"/></map></td></tr></table></center>
 </div>
 </p>
 <table border="0" cellpadding="0" cellspacing="0">

data/doc/cxxapi/group__Core.map

@@ -1,3 +1,3 @@
 <map id="structs" name="structs">
-<area shape="rect" id="node2" href="$group__Hooks.html" title="Apache hooks" alt="" coords="349,5,461,35"/>
+<area shape="rect" id="node2" href="$group__Hooks.html" title="Apache hooks" alt="" coords="303,5,399,33"/>
 </map>

data/doc/cxxapi/group__Hooks.html

@@ -29,7 +29,7 @@ Collaboration diagram for Apache hooks:</div>
 <div class="dynsection">
 <center><table><tr><td><img src="group__Hooks.png" border="0" alt="" usemap="#group____Hooks_map"/>
 <map name="group____Hooks_map" id="group____Hooks">
-<area shape="rect" id="node1" href="group__Core.html" title="Core Apache&#45;related classes and functions" alt="" coords="7,5,300,35"/></map></td></tr></table></center>
+<area shape="rect" id="node1" href="group__Core.html" title="Core Apache&#45;related classes and functions" alt="" coords="5,5,253,33"/></map></td></tr></table></center>
 </div>
 </p>
 <table border="0" cellpadding="0" cellspacing="0">

data/doc/cxxapi/group__Hooks.map

@@ -1,3 +1,3 @@
 <map id="structs" name="structs">
-<area shape="rect" id="node1" href="$group__Core.html" title="Core Apache&#45;related classes and functions" alt="" coords="7,5,300,35"/>
+<area shape="rect" id="node1" href="$group__Core.html" title="Core Apache&#45;related classes and functions" alt="" coords="5,5,253,33"/>
 </map>

data/doc/cxxapi/ngx__http__passenger__module_8h_source.html

@@ -53,39 +53,40 @@
 <a name="l00028"></a>00028 <span class="preprocessor">#ifndef _PASSENGER_NGINX_MODULE_H_</span>
 <a name="l00029"></a>00029 <span class="preprocessor"></span><span class="preprocessor">#define _PASSENGER_NGINX_MODULE_H_</span>
 <a name="l00030"></a>00030 <span class="preprocessor"></span>
-<a name="l00031"></a>00031 <span class="preprocessor">#include &lt;ngx_core.h&gt;</span>
-<a name="l00032"></a>00032 <span class="preprocessor">#include &quot;../common/AgentsStarter.h&quot;</span>
-<a name="l00033"></a>00033 <span class="preprocessor">#include &quot;../common/Utils/CachedFileStat.h&quot;</span>
-<a name="l00034"></a>00034 <span class="comment"></span>
-<a name="l00035"></a>00035 <span class="comment">/**</span>
-<a name="l00036"></a>00036 <span class="comment"> * The Nginx version number as an integer.</span>
-<a name="l00037"></a>00037 <span class="comment"> * For example, on nginx 1.7.30 this value is 1007030.</span>
-<a name="l00038"></a>00038 <span class="comment"> */</span>
-<a name="l00039"></a>00039 <span class="preprocessor">#define NGINX_VERSION_NUM \</span>
-<a name="l00040"></a>00040 <span class="preprocessor">    (1000000 * PASSENGER_NGINX_MAJOR_VERSION + \</span>
-<a name="l00041"></a>00041 <span class="preprocessor">     1000   * PASSENGER_NGINX_MINOR_VERSION + \</span>
-<a name="l00042"></a>00042 <span class="preprocessor">     PASSENGER_NGINX_MICRO_VERSION)</span>
-<a name="l00043"></a>00043 <span class="preprocessor"></span>
-<a name="l00044"></a>00044 <span class="keyword">extern</span> ngx_module_t ngx_http_passenger_module;
-<a name="l00045"></a>00045 <span class="comment"></span>
-<a name="l00046"></a>00046 <span class="comment">/**</span>
-<a name="l00047"></a>00047 <span class="comment"> * A static schema string to be assigned to Nginx &#39;upstream&#39; strctures.</span>
-<a name="l00048"></a>00048 <span class="comment"> */</span>
-<a name="l00049"></a>00049 <span class="keyword">extern</span> ngx_str_t                passenger_schema_string;
-<a name="l00050"></a>00050 
-<a name="l00051"></a>00051 <span class="keyword">extern</span> ngx_str_t                passenger_placeholder_upstream_address;
-<a name="l00052"></a>00052 <span class="comment"></span>
-<a name="l00053"></a>00053 <span class="comment">/**</span>
-<a name="l00054"></a>00054 <span class="comment"> * A CachedFileStat object used for caching stat() calls.</span>
-<a name="l00055"></a>00055 <span class="comment"> */</span>
-<a name="l00056"></a>00056 <span class="keyword">extern</span> PassengerCachedFileStat *passenger_stat_cache;
-<a name="l00057"></a>00057 
-<a name="l00058"></a>00058 <span class="keyword">extern</span> AgentsStarter           *passenger_agents_starter;
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060 <span class="keyword">extern</span> ngx_cycle_t             *passenger_current_cycle;
-<a name="l00061"></a>00061 
-<a name="l00062"></a>00062 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_NGINX_MODULE_H_ */</span>
-<a name="l00063"></a>00063 
+<a name="l00031"></a>00031 <span class="preprocessor">#include &lt;ngx_config.h&gt;</span>
+<a name="l00032"></a>00032 <span class="preprocessor">#include &lt;ngx_core.h&gt;</span>
+<a name="l00033"></a>00033 <span class="preprocessor">#include &quot;../common/AgentsStarter.h&quot;</span>
+<a name="l00034"></a>00034 <span class="preprocessor">#include &quot;../common/Utils/CachedFileStat.h&quot;</span>
+<a name="l00035"></a>00035 <span class="comment"></span>
+<a name="l00036"></a>00036 <span class="comment">/**</span>
+<a name="l00037"></a>00037 <span class="comment"> * The Nginx version number as an integer.</span>
+<a name="l00038"></a>00038 <span class="comment"> * For example, on nginx 1.7.30 this value is 1007030.</span>
+<a name="l00039"></a>00039 <span class="comment"> */</span>
+<a name="l00040"></a>00040 <span class="preprocessor">#define NGINX_VERSION_NUM \</span>
+<a name="l00041"></a>00041 <span class="preprocessor">    (1000000 * PASSENGER_NGINX_MAJOR_VERSION + \</span>
+<a name="l00042"></a>00042 <span class="preprocessor">     1000   * PASSENGER_NGINX_MINOR_VERSION + \</span>
+<a name="l00043"></a>00043 <span class="preprocessor">     PASSENGER_NGINX_MICRO_VERSION)</span>
+<a name="l00044"></a>00044 <span class="preprocessor"></span>
+<a name="l00045"></a>00045 <span class="keyword">extern</span> ngx_module_t ngx_http_passenger_module;
+<a name="l00046"></a>00046 <span class="comment"></span>
+<a name="l00047"></a>00047 <span class="comment">/**</span>
+<a name="l00048"></a>00048 <span class="comment"> * A static schema string to be assigned to Nginx &#39;upstream&#39; strctures.</span>
+<a name="l00049"></a>00049 <span class="comment"> */</span>
+<a name="l00050"></a>00050 <span class="keyword">extern</span> ngx_str_t                passenger_schema_string;
+<a name="l00051"></a>00051 
+<a name="l00052"></a>00052 <span class="keyword">extern</span> ngx_str_t                passenger_placeholder_upstream_address;
+<a name="l00053"></a>00053 <span class="comment"></span>
+<a name="l00054"></a>00054 <span class="comment">/**</span>
+<a name="l00055"></a>00055 <span class="comment"> * A CachedFileStat object used for caching stat() calls.</span>
+<a name="l00056"></a>00056 <span class="comment"> */</span>
+<a name="l00057"></a>00057 <span class="keyword">extern</span> PassengerCachedFileStat *passenger_stat_cache;
+<a name="l00058"></a>00058 
+<a name="l00059"></a>00059 <span class="keyword">extern</span> AgentsStarter           *passenger_agents_starter;
+<a name="l00060"></a>00060 
+<a name="l00061"></a>00061 <span class="keyword">extern</span> ngx_cycle_t             *passenger_current_cycle;
+<a name="l00062"></a>00062 
+<a name="l00063"></a>00063 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_NGINX_MODULE_H_ */</span>
+<a name="l00064"></a>00064 
 </pre></div></div>
 <hr size="1"/><address style="text-align: right;"><small>Generated by&nbsp;
 <a href="http://www.doxygen.org/index.html">

data/ext/apache2/Hooks.cpp

@@ -770,6 +770,7 @@ private:
 						r->status);
 				}
 				apr_table_setn(r->headers_out, "Status", r->status_line);
+				log->message(string("Status: ") + r->status_line);
 				
 				bool xsendfile = hasModXsendfile() &&
 					apr_table_get(r->err_headers_out, "X-Sendfile");

data/ext/common/AgentBase.cpp

@@ -154,8 +154,12 @@ appendSignalReason(char *buf, siginfo_t *info) {
 	#endif
 	SI_CODE_HANDLER(SI_QUEUE);
 	SI_CODE_HANDLER(SI_TIMER);
-	SI_CODE_HANDLER(SI_ASYNCIO);
-	SI_CODE_HANDLER(SI_MESGQ);
+	#ifdef SI_ASYNCIO
+		SI_CODE_HANDLER(SI_ASYNCIO);
+	#endif
+	#ifdef SI_MESGQ
+		SI_CODE_HANDLER(SI_MESGQ);
+	#endif
 	#ifdef SI_SIGIO
 		SI_CODE_HANDLER(SI_SIGIO);
 	#endif

data/ext/common/Constants.h

@@ -26,7 +26,7 @@
 #define _PASSENGER_CONSTANTS_H_
 
 /* Don't forget to update lib/phusion_passenger.rb too. */
-#define PASSENGER_VERSION "3.0.6"
+#define PASSENGER_VERSION "3.0.7"
 
 #define FEEDBACK_FD 3
 

data/ext/common/LoggingAgent/LoggingServer.h

@@ -44,7 +44,6 @@
 
 #include "DataStoreId.h"
 #include "RemoteSender.h"
-#include "ChangeNotifier.h"
 #include "FilterSupport.h"
 #include "../EventedMessageServer.h"
 #include "../MessageReadersWriters.h"
@@ -121,7 +120,7 @@ private:
 		
 		virtual void append(const DataStoreId &dataStoreId,
 			const StaticString &data) = 0;
-		virtual void flush() { }
+		virtual bool flush() { return true; }
 		virtual void dump(ostream &stream) const { }
 	};
 	
@@ -133,12 +132,6 @@ private:
 		char buffer[BUFFER_CAPACITY];
 		unsigned int bufferSize;
 		
-		/**
-		 * Contains every (groupName, nodeName, category) tuple for
-		 * which their data is currently buffered in this sink.
-		 */
-		set<DataStoreId> dataStoreIds;
-		
 		LogFile(LoggingServer *server, const string &filename, mode_t filePermissions)
 			: LogSink(server)
 		{
@@ -163,22 +156,7 @@ private:
 			flush();
 		}
 		
-		void notifyChanges() {
-			if (server->changeNotifier != NULL) {
-				set<DataStoreId>::const_iterator it;
-				set<DataStoreId>::const_iterator end = dataStoreIds.end();
-			
-				for (it = dataStoreIds.begin(); it != dataStoreIds.end(); it++) {
-					server->changeNotifier->changed(*it);
-				}
-			}
-			dataStoreIds.clear();
-		}
-		
 		virtual void append(const DataStoreId &dataStoreId, const StaticString &data) {
-			if (server->changeNotifier != NULL) {
-				dataStoreIds.insert(dataStoreId);
-			}
 			if (bufferSize + data.size() > BUFFER_CAPACITY) {
 				StaticString data2[2];
 				data2[0] = StaticString(buffer, bufferSize);
@@ -187,19 +165,20 @@ private:
 				gatheredWrite(fd, data2, 2);
 				lastFlushed = ev_now(server->getLoop());
 				bufferSize = 0;
-				notifyChanges();
 			} else {
 				memcpy(buffer + bufferSize, data.data(), data.size());
 				bufferSize += data.size();
 			}
 		}
 		
-		virtual void flush() {
+		virtual bool flush() {
 			if (bufferSize > 0) {
 				lastFlushed = ev_now(server->getLoop());
 				writeExact(fd, buffer, bufferSize);
 				bufferSize = 0;
-				notifyChanges();
+				return true;
+			} else {
+				return false;
 			}
 		}
 		
@@ -270,13 +249,16 @@ private:
 			}
 		}
 		
-		virtual void flush() {
+		virtual bool flush() {
 			if (bufferSize > 0) {
 				lastFlushed = ev_now(server->getLoop());
 				StaticString data(buffer, bufferSize);
 				server->remoteSender.schedule(unionStationKey, nodeName,
 					category, &data, 1);
 				bufferSize = 0;
+				return true;
+			} else {
+				return false;
 			}
 		}
 		
@@ -376,8 +358,7 @@ private:
 	
 	enum ClientType {
 		UNINITIALIZED,
-		LOGGER,
-		WATCHER
+		LOGGER
 	};
 	
 	struct Client: public EventedMessageClient {
@@ -411,7 +392,6 @@ private:
 	string dirPermissions;
 	mode_t filePermissions;
 	RemoteSender remoteSender;
-	ChangeNotifierPtr changeNotifier;
 	ev::timer garbageCollectionTimer;
 	ev::timer sinkFlushingTimer;
 	ev::timer exitTimer;
@@ -820,58 +800,6 @@ private:
 		return true;
 	}
 	
-	bool getLastEntryInDirectory(const string &path, string &result) const {
-		DIR *dir = opendir(path.c_str());
-		struct dirent *entry;
-		vector<string> subdirs;
-		
-		if (dir == NULL) {
-			int e = errno;
-			throw FileSystemException("Cannot open directory " + path,
-				e, path);
-		}
-		while ((entry = readdir(dir)) != NULL) {
-			if (isDirectory(path, entry) && looksLikeNumber(entry->d_name)) {
-				subdirs.push_back(entry->d_name);
-			}
-		}
-		closedir(dir);
-		
-		if (subdirs.empty()) {
-			return false;
-		}
-		
-		vector<string>::const_iterator it = subdirs.begin();
-		vector<string>::const_iterator end = subdirs.end();
-		vector<string>::const_iterator largest_it = subdirs.begin();
-		int largest = atoi(subdirs[0]);
-		for (it++; it != end; it++) {
-			const string &subdir = *it;
-			int number = atoi(subdir.c_str());
-			if (number > largest) {
-				largest_it = it;
-				largest = number;
-			}
-		}
-		result = *largest_it;
-		return true;
-	}
-	
-	static void pendingDataFlushed(EventedClient *_client) {
-		Client *client = (Client *) _client;
-		LoggingServer *self = (LoggingServer *) client->userData;
-		
-		client->onPendingDataFlushed = NULL;
-		if (OXT_UNLIKELY( client->type != WATCHER )) {
-			P_WARN("BUG: pendingDataFlushed() called even though client type is not WATCHER.");
-			client->disconnect();
-		} else if (self->changeNotifier != NULL) {
-			self->changeNotifier->addClient(client->detach());
-		} else {
-			client->disconnect();
-		}
-	}
-	
 	/* Release all inactive log sinks that have been inactive for more than
 	 * GARBAGE_COLLECTION_TIMEOUT seconds.
 	 */
@@ -1160,26 +1088,6 @@ protected:
 			client->type = LOGGER;
 			client->writeArrayMessage("ok", NULL);
 			
-		} else if (args[0] == "watchChanges") {
-			if (OXT_UNLIKELY( !checkWhetherConnectionAreAcceptable(client) )) {
-				return true;
-			}
-			if (OXT_UNLIKELY( client->type != UNINITIALIZED )) {
-				sendErrorToClient(client, "This command cannot be invoked "
-					"if the 'init' command is already invoked.");
-				client->disconnect();
-				return true;
-			}
-			
-			client->type = WATCHER;
-			client->notifyReads(false);
-			discardReadData();
-			
-			// Add to the change notifier after all pending data
-			// has been written out.
-			client->onPendingDataFlushed = pendingDataFlushed;
-			client->writeArrayMessage("ok", NULL);
-			
 		} else if (args[0] == "flush") {
 			flushAllSinks();
 			client->writeArrayMessage("ok", NULL);
@@ -1334,79 +1242,18 @@ public:
 		}
 		
 		// Invoke destructors, causing all transactions and log sinks to
-		// be flushed before RemoteSender and ChangeNotifier are being
-		// destroyed.
+		// be flushed before RemoteSender is being destroyed.
 		transactions.clear();
 		logSinkCache.clear();
 		inactiveLogSinks.clear();
 	}
 	
-	void setChangeNotifier(const ChangeNotifierPtr &_changeNotifier) {
-		changeNotifier = _changeNotifier;
-		changeNotifier->getLastPos = boost::bind(&LoggingServer::getLastPos,
-			this, _1, _2, _3);
-	}
-	
-	string getLastPos(const StaticString &groupName, const StaticString &nodeName,
-		const StaticString &category) const
-	{
-		md5_state_t state;
-		md5_byte_t  digest[MD5_SIZE];
-		char        nodeId[MD5_HEX_SIZE];
-		md5_init(&state);
-		md5_append(&state, (const md5_byte_t *) nodeName.data(), nodeName.size());
-		md5_finish(&state, digest);
-		toHex(StaticString((const char *) digest, MD5_SIZE), nodeId);
-		
-		string dir = determineFilename(groupName, nodeId, category);
-		string subdir, component;
-		subdir.reserve(13); // It's a string that looks like: "2010/06/24/12"
-		
-		try {
-			// Loop 4 times to process year, month, day, hour.
-			for (int i = 0; i < 4; i++) {
-				bool found = getLastEntryInDirectory(dir, component);
-				if (!found) {
-					return string();
-				}
-				dir.append("/");
-				dir.append(component);
-				if (i != 0) {
-					subdir.append("/");
-				}
-				subdir.append(component);
-			}
-			// After the loop, new dir == old dir + "/" + subdir
-		} catch (const SystemException &e) {
-			if (e.code() == ENOENT) {
-				return string();
-			} else {
-				throw;
-			}
-		}
-		
-		string &filename = dir;
-		filename.append("/log.txt");
-		
-		struct stat buf;
-		if (stat(filename.c_str(), &buf) == -1) {
-			if (errno == ENOENT) {
-				return string();
-			} else {
-				int e = errno;
-				throw FileSystemException("Cannot stat() " + filename, e,
-					filename);
-			}
-		} else {
-			return subdir + "/" + toString(buf.st_size);
-		}
-	}
-	
 	void dump(ostream &stream) const {
 		TransactionMap::const_iterator it;
 		TransactionMap::const_iterator end = transactions.end();
 		
-		stream << "Number of clients: " << getClients().size() << "\n";
+		stream << "Number of clients : " << getClients().size() << "\n";
+		stream << "RemoteSender queue: " << remoteSender.queued() << " items\n";
 		stream << "Open transactions: " << transactions.size() << "\n";
 		for (it = transactions.begin(); it != end; it++) {
 			const TransactionPtr &transaction = it->second;

data/ext/common/LoggingAgent/RemoteSender.h

@@ -97,6 +97,8 @@ private:
 					throw IOException("Unable to create a CURL handle");
 				}
 			}
+			curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
+			curl_easy_setopt(curl, CURLOPT_TIMEOUT, 180);
 			curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, lastErrorMessage);
 			curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
 			curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlDataReceived);
@@ -467,7 +469,13 @@ public:
 			}
 		}
 		
-		queue.add(item);
+		if (!queue.tryAdd(item)) {
+			P_WARN("The Union Station gateway isn't responding quickly enough; dropping packet.");
+		}
+	}
+	
+	unsigned int queued() const {
+		return queue.size();
 	}
 };
 

data/ext/common/Utils/BlockingQueue.h

@@ -37,7 +37,7 @@ using namespace boost;
 template<typename T>
 class BlockingQueue {
 private:
-	timed_mutex lock;
+	mutable timed_mutex lock;
 	condition_variable_any added;
 	condition_variable_any removed;
 	unsigned int max;
@@ -52,6 +52,11 @@ public:
 		this->max = max;
 	}
 	
+	unsigned int size() const {
+		lock_guard<timed_mutex> l(lock);
+		return queue.size();
+	}
+	
 	void add(const T &item) {
 		unique_lock<timed_mutex> l(lock);
 		while (atMaxCapacity()) {
@@ -64,6 +69,20 @@ public:
 		}
 	}
 	
+	bool tryAdd(const T &item) {
+		lock_guard<timed_mutex> l(lock);
+		if (!atMaxCapacity()) {
+			queue.push(item);
+			added.notify_one();
+			if (!atMaxCapacity()) {
+				removed.notify_one();
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
 	T get() {
 		unique_lock<timed_mutex> l(lock);
 		while (queue.empty()) {

data/ext/common/Watchdog.cpp

@@ -47,6 +47,7 @@
 #include "RandomGenerator.h"
 #include "Logging.h"
 #include "Exceptions.h"
+#include "StaticString.h"
 #include "ResourceLocator.h"
 #include "Utils.h"
 #include "Utils/Base64.h"
@@ -79,6 +80,7 @@ static unsigned int maxInstancesPerApp;
 static unsigned int poolIdleTime;
 static string  serializedPrestartURLs;
 
+static string oldOomScore;
 static ServerInstanceDirPtr serverInstanceDir;
 static ServerInstanceDir::GenerationPtr generation;
 static string loggingAgentAddress;
@@ -88,6 +90,8 @@ static EventFd *errorEvent;
 
 #define REQUEST_SOCKET_PASSWORD_SIZE     64
 
+static string setOomScore(const StaticString &score);
+
 
 /**
  * Abstract base class for watching agent processes.
@@ -100,7 +104,7 @@ private:
 	void threadMain() {
 		try {
 			pid_t pid, ret;
-			int status;
+			int status, e;
 			
 			while (!this_thread::interruption_requested()) {
 				lock.lock();
@@ -123,6 +127,9 @@ private:
 					P_WARN("waitpid() on " << name() << " return -1 with " <<
 						"errno = ECHILD, falling back to kill polling");
 					waitpidUsingKillPolling(pid);
+					e = 0;
+				} else {
+					e = errno;
 				}
 				
 				lock.lock();
@@ -132,7 +139,6 @@ private:
 				this_thread::disable_interruption di;
 				this_thread::disable_syscall_interruption dsi;
 				if (ret == -1) {
-					int e = errno;
 					P_WARN(name() << " crashed or killed for "
 						"an unknown reason (errno = " <<
 						strerror(e) << "), restarting it...");
@@ -345,6 +351,8 @@ public:
 			 * agent as well as all its descendant processes. */
 			setpgid(getpid(), getpid());
 			
+			setOomScore(oldOomScore);
+			
 			try {
 				execProgram();
 			} catch (...) {
@@ -715,6 +723,8 @@ private:
 					_exit(1);
 				}
 				
+				setOomScore(oldOomScore);
+				
 				execlp("/bin/sh", "/bin/sh", "-c", "find . | xargs touch", (char *) 0);
 				e = errno;
 				fprintf(stderr, "Cannot execute 'find . | xargs touch': %s (%d)\n",
@@ -748,22 +758,44 @@ public:
 
 
 /**
- * Most operating systems overcommit memory. We *know* that this watchdog process
- * doesn't use much memory; on OS X it uses about 200 KB of private RSS. If the
- * watchdog is killed by the system Out-Of-Memory Killer or then it's all over:
- * the system administrator will have to restart the web server for Phusion
- * Passenger to be usable again. So in this function we do whatever is necessary
- * to prevent this watchdog process from becoming a candidate for the OS's
- * Out-Of-Memory Killer.
+ * Linux-only way to change OOM killer configuration for
+ * current process. Requires root privileges, which we
+ * should have.
  */
-static void
-disableOomKiller() {
-	// Linux-only way to disable OOM killer for current process. Requires root
-	// privileges, which we should have.
-	FILE *f = fopen("/proc/self/oom_adj", "w");
-	if (f != NULL) {
-		fprintf(f, "-17");
+static string
+setOomScore(const StaticString &score) {
+	if (!score.empty()) {
+		string oldScore;
+		
+		FILE *f = fopen("/proc/self/oom_adj", "r");
+		if (f == NULL) {
+			return "";
+		}
+		char buf[1024];
+		size_t bytesRead;
+		while (true) {
+			bytesRead = fread(buf, 1, sizeof(buf), f);
+			if (bytesRead == 0 && feof(f)) {
+				break;
+			} else if (bytesRead == 0 && ferror(f)) {
+				fclose(f);
+				return "";
+			} else {
+				oldScore.append(buf, bytesRead);
+			}
+		}
+		fclose(f);
+		
+		f = fopen("/proc/self/oom_adj", "w");
+		if (f == NULL) {
+			return "";
+		}
+		fwrite(score.data(), 1, score.size(), f);
 		fclose(f);
+		
+		return oldScore;
+	} else {
+		return "";
 	}
 }
 
@@ -917,7 +949,16 @@ forceAllAgentsShutdown(vector<AgentWatcher *> &watchers) {
 
 int
 main(int argc, char *argv[]) {
-	disableOomKiller();
+	/*
+	 * Most operating systems overcommit memory. We *know* that this watchdog process
+	 * doesn't use much memory; on OS X it uses about 200 KB of private RSS. If the
+	 * watchdog is killed by the system Out-Of-Memory Killer or then it's all over:
+	 * the system administrator will have to restart the web server for Phusion
+	 * Passenger to be usable again. So here we disable Linux's OOM killer
+	 * for this watchdog. Note that the OOM score is inherited by child processes
+	 * so we need to restore it after each fork().
+	 */
+	oldOomScore = setOomScore("-17");
 	
 	agentsOptions = initializeAgent(argc, argv, "PassengerWatchdog");
 	logLevel      = agentsOptions.getInt("log_level");

data/ext/nginx/HelperAgent.cpp

@@ -313,7 +313,9 @@ private:
 	 *                                     before we were able to send back the
 	 *                                     full response.
 	 */
-	void forwardResponse(SessionPtr &session, FileDescriptor &clientFd) {
+	void forwardResponse(SessionPtr &session, FileDescriptor &clientFd,
+		const AnalyticsLogPtr &log)
+	{
 		TRACE_POINT();
 		HttpStatusExtractor ex;
 		int stream = session->getStream();
@@ -345,6 +347,11 @@ private:
 					writeExact(clientFd, statusLine);
 					UPDATE_TRACE_POINT();
 					writeExact(clientFd, ex.getBuffer());
+					if (!log->isNull()) {
+						string partialStatusLine = ex.getStatusLine();
+						partialStatusLine.erase(partialStatusLine.size() - 2, 2);
+						log->message("Status: " + partialStatusLine);
+					}
 					break;
 				} catch (const SystemException &e) {
 					if (e.code() == EPIPE) {
@@ -555,7 +562,7 @@ private:
 					scope.success();
 				}
 				
-				forwardResponse(session, clientFd);
+				forwardResponse(session, clientFd, log);
 				
 				requestProxyingScope.success();
 			} catch (const SpawnException &e) {

data/ext/nginx/StaticContentHandler.h

@@ -28,6 +28,7 @@
 #ifndef _PASSENGER_NGINX_STATIC_CONTENT_HANDLER_H_
 #define _PASSENGER_NGINX_STATIC_CONTENT_HANDLER_H_
 
+#include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
 

data/ext/nginx/ngx_http_passenger_module.h

@@ -28,6 +28,7 @@
 #ifndef _PASSENGER_NGINX_MODULE_H_
 #define _PASSENGER_NGINX_MODULE_H_
 
+#include <ngx_config.h>
 #include <ngx_core.h>
 #include "../common/AgentsStarter.h"
 #include "../common/Utils/CachedFileStat.h"

data/lib/phusion_passenger.rb

@@ -25,10 +25,10 @@ module PhusionPassenger
 	###### Version numbers ######
 	
 	# Phusion Passenger version number. Don't forget to edit ext/common/Constants.h too.
-	VERSION_STRING = '3.0.6'
+	VERSION_STRING = '3.0.7'
 	
-	PREFERRED_NGINX_VERSION = '0.8.54'
-	PREFERRED_PCRE_VERSION  = '8.10'
+	PREFERRED_NGINX_VERSION = '1.0.0'
+	PREFERRED_PCRE_VERSION  = '8.12'
 	STANDALONE_INTERFACE_VERSION  = 1
 	
 	

data/lib/phusion_passenger/platform_info/apache.rb

@@ -274,7 +274,7 @@ module PlatformInfo
 	# headers are placed into the same directory as the Apache headers,
 	# and so 'apr-config' and 'apu-config' won't be necessary in that case.
 	def self.apr_config_needed_for_building_apache_modules?
-		filename = File.join("#{test_exe_outdir}/passenger-platform-check-#{Process.pid}.c")
+		filename = File.join("#{tmpexedir}/passenger-platform-check-#{Process.pid}.c")
 		File.open(filename, "w") do |f|
 			f.puts("#include <apr.h>")
 		end

data/lib/phusion_passenger/standalone/start_command.rb

@@ -57,7 +57,6 @@ class StartCommand < Command
 		sanity_check_options
 		
 		ensure_nginx_installed
-		require_file_tail if should_watch_logs?
 		determine_various_resource_locations
 		require_app_finder
 		@app_finder = AppFinder.new(@args, @options)
@@ -105,15 +104,6 @@ class StartCommand < Command
 	end
 
 private
-	def require_file_tail
-		begin
-			require 'file/tail'
-		rescue LoadError
-			error "Please install file-tail first: sudo gem install file-tail"
-			exit 1
-		end
-	end
-	
 	def require_file_utils
 		require 'fileutils' unless defined?(FileUtils)
 	end
@@ -433,7 +423,6 @@ private
 	end
 	
 	def watch_log_files_in_background
-		require_file_tail
 		@apps.each do |app|
 			thread = Thread.new do
 				watch_log_file("#{app[:root]}/log/#{@options[:env]}.log")

data/lib/phusion_passenger/templates/standalone/config.erb

@@ -91,5 +91,6 @@ http {
             union_station_key <%= app[:union_station_key] %>;
         <% end %>
     }
+    passenger_pre_start http://<%= nginx_listen_address(app) %>;
     <% end %>
 }

data/test/cxx/LoggingTest.cpp

@@ -114,33 +114,6 @@ namespace tut {
 			}
 			return client;
 		}
-		
-		void setChangeNotifier(const ChangeNotifierPtr &notifier) {
-			server->setChangeNotifier(notifier);
-		}
-		
-		
-		class MyChangeNotifier: public ChangeNotifier {
-		public:
-			boost::mutex lock;
-			AtomicInt added;
-			set<DataStoreId> changes;
-			
-			MyChangeNotifier(struct ev_loop *loop)
-				: ChangeNotifier(loop)
-				{ }
-			
-			virtual void addClient(const FileDescriptor &fd) {
-				added = added + 1;
-			}
-		
-			virtual void changed(const DataStoreId &dataStoreId) {
-				lock_guard<boost::mutex> l(lock);
-				changes.insert(dataStoreId);
-			}
-		};
-		
-		typedef shared_ptr<MyChangeNotifier> MyChangeNotifierPtr;
 	};
 	
 	DEFINE_TEST_GROUP(LoggingTest);
@@ -555,53 +528,6 @@ namespace tut {
 		}
 	}
 	
-	TEST_METHOD(19) {
-		// getLastPos() works
-		SystemTime::forceAll(YESTERDAY);
-		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
-		log->message("hello world");
-		log->flushToDiskAfterClose(true);
-		log.reset();
-		
-		SystemTime::forceAll(TODAY);
-		
-		log = logger->newTransaction("foobar");
-		log->message("hello world");
-		log->flushToDiskAfterClose(true);
-		log.reset();
-		
-		stopLoggingServer(false);
-		
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/13/12/log.txt";
-		struct stat buf;
-		ensure_equals(stat(filename.c_str(), &buf), 0);
-		string lastPos = server->getLastPos("foobar", "localhost", "requests");
-		ensure_equals(lastPos, "2010/01/13/12/" + toString(buf.st_size));
-	}
-	
-	TEST_METHOD(20) {
-		// getLastPos() returns the empty string if log.txt or if one of
-		// the subdirectories are missing.
-		SystemTime::forceAll(YESTERDAY);
-		
-		AnalyticsLogPtr log = logger->newTransaction("foobar");
-		log->message("hello world");
-		log->flushToDiskAfterClose(true);
-		log.reset();
-		
-		stopLoggingServer(false);
-		
-		string filename = loggingDir + "/1/" FOOBAR_LOCALHOST_PREFIX "/requests/2010/01/12/12/log.txt";
-		unlink(filename.c_str());
-		
-		string lastPos = server->getLastPos("foobar", "localhost", "requests");
-		ensure_equals(lastPos, "");
-		
-		lastPos = server->getLastPos("baz", "localhost", "requests");
-		ensure_equals(lastPos, "");
-	}
-	
 	TEST_METHOD(21) {
 		// The server temporarily buffers data in memory.
 		SystemTime::forceAll(YESTERDAY);
@@ -806,92 +732,7 @@ namespace tut {
 		ensure(log->isNull());
 	}
 	
-	TEST_METHOD(30) {
-		// The "watchChanges" command causes the server to detach the
-		// client and to pass it to the change notifier.
-		MyChangeNotifierPtr notifier(new MyChangeNotifier(eventLoop));
-		stopLoggingServer();
-		startLoggingServer(boost::bind(&LoggingTest::setChangeNotifier, this, notifier));
-		
-		vector<string> args;
-		MessageClient client = createConnection(false);
-		client.write("watchChanges", NULL, NULL);
-		ensure(client.read(args));
-		EVENTUALLY(1,
-			result = notifier->added == 1;
-		);
-		// MyChangeNotifier doesn't store the client file descriptor
-		// so should be closed.
-		ensure(!client.read(args));
-	}
-	
-	TEST_METHOD(31) {
-		// The server notifies the given ChangeNotifier with the
-		// appropriate changes whenever a log file sink is flushed.
-		MyChangeNotifierPtr notifier(new MyChangeNotifier(eventLoop));
-		stopLoggingServer();
-		startLoggingServer(boost::bind(&LoggingTest::setChangeNotifier, this, notifier));
-		
-		AnalyticsLogPtr log = logger->newTransaction("foo", "requests");
-		log->message("hello world");
-		log.reset();
-		
-		log = logger->newTransaction("bar", "requests");
-		log->message("hello world");
-		log.reset();
-		
-		SHOULD_NEVER_HAPPEN(100,
-			lock_guard<boost::mutex> l(notifier->lock);
-			result = !notifier->changes.empty();
-		);
-		
-		MessageChannel channel(logger->getConnection());
-		vector<string> args;
-		channel.write("flush", NULL);
-		ensure("(1)", channel.read(args));
-		
-		EVENTUALLY(1,
-			lock_guard<boost::mutex> l(notifier->lock);
-			result = notifier->changes.size() == 2;
-		);
-		unique_lock<boost::mutex> l(notifier->lock);
-		ensure("(2)",
-			notifier->changes.find(DataStoreId("foo", "localhost", "requests")) !=
-			notifier->changes.end());
-		ensure("(3)",
-			notifier->changes.find(DataStoreId("bar", "localhost", "requests")) !=
-			notifier->changes.end());
-		notifier->changes.clear();
-		l.unlock();
-		
-		
-		log = logger->newTransaction("baz", "exceptions");
-		log->message("hello world");
-		log.reset();
-		
-		channel.write("flush", NULL);
-		ensure("(4)", channel.read(args));
-		
-		log = logger->newTransaction("bazz", "exceptions");
-		log->message("hello world");
-		log.reset();
-		
-		EVENTUALLY(1,
-			lock_guard<boost::mutex> l(notifier->lock);
-			result = notifier->changes.size() == 1;
-		);
-		l.lock();
-		ensure("(5)",
-			notifier->changes.find(DataStoreId("baz", "localhost", "exceptions")) !=
-			notifier->changes.end());
-		l.unlock();
-		SHOULD_NEVER_HAPPEN(100,
-			lock_guard<boost::mutex> l(notifier->lock);
-			result = notifier->changes.size() != 1;
-		);
-	}
-	
-	TEST_METHOD(32) {
+	TEST_METHOD(29) {
 		// One can supply a custom node name per openTransaction command.
 		MessageClient client1 = createConnection();
 		vector<string> args;
@@ -910,7 +751,7 @@ namespace tut {
 		ensure(fileExists(filename));
 	}
 	
-	TEST_METHOD(33) {
+	TEST_METHOD(30) {
 		// A transaction is only written to the sink if it passes all given filters.
 		// Test logging of new transaction.
 		SystemTime::forceAll(YESTERDAY);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: passenger
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 3
   - 0
-  - 6
-  version: 3.0.6
+  - 7
+  version: 3.0.7
 platform: ruby
 authors: 
 - Phusion - http://www.phusion.nl/
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-03 00:00:00 +02:00
+date: 2011-04-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -730,7 +730,6 @@ files:
 - ext/common/HelperAgent/BacktracesServer.h
 - ext/common/IniFile.h
 - ext/common/Logging.h
-- ext/common/LoggingAgent/ChangeNotifier.h
 - ext/common/LoggingAgent/DataStoreId.h
 - ext/common/LoggingAgent/FilterSupport.h
 - ext/common/LoggingAgent/LoggingServer.h

data/ext/common/LoggingAgent/ChangeNotifier.h

@@ -1,63 +0,0 @@
-/*
- *  Phusion Passenger - http://www.modrails.com/
- *  Copyright (c) 2010 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_CHANGE_NOTIFIER_H_
-#define _PASSENGER_CHANGE_NOTIFIER_H_
-
-#include <boost/function.hpp>
-#include <boost/shared_ptr.hpp>
-#include <string>
-#include <ev++.h>
-#include "DataStoreId.h"
-#include "../EventedClient.h"
-#include "../FileDescriptor.h"
-#include "../StaticString.h"
-
-namespace Passenger {
-
-using namespace std;
-using namespace boost;
-
-
-class ChangeNotifier {
-public:
-	typedef function<string (const StaticString &groupName, const StaticString &nodeName,
-		const StaticString &category)> GetLastPosFunction;
-	
-	GetLastPosFunction getLastPos;
-	
-	ChangeNotifier(struct ev_loop *_loop) { }
-	virtual ~ChangeNotifier() { }
-	
-	virtual void addClient(const FileDescriptor &fd) { }
-	
-	virtual void changed(const DataStoreId &dataStoreId) { }
-};
-
-typedef shared_ptr<ChangeNotifier> ChangeNotifierPtr;
-
-
-} // namespace Passenger
-
-#endif /* _PASSENGER_CHANGE_NOTIFIER_H_ */