passenger 3.0.0 → 3.0.1

data/doc/cxxapi/ServerInstanceDir_8h_source.html

@@ -246,126 +246,130 @@
 <a name="l00221"></a>00221         }
 <a name="l00222"></a>00222         
 <a name="l00223"></a>00223         <span class="keywordtype">bool</span> isDirectory(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;dir, <span class="keyword">struct</span> dirent *entry)<span class="keyword"> const </span>{
-<a name="l00224"></a>00224 <span class="preprocessor">                #ifdef __sun__</span>
-<a name="l00225"></a>00225 <span class="preprocessor"></span>                        <span class="keywordtype">string</span> path = dir;
-<a name="l00226"></a>00226                         path.append(<span class="stringliteral">&quot;/&quot;</span>);
-<a name="l00227"></a>00227                         path.append(entry-&gt;d_name);
-<a name="l00228"></a>00228                         <span class="keywordflow">return</span> <a class="code" href="group__Support.html#ga15298b031377d3ecb80295bd5b1a8180" title="Check whether &amp;#39;filename&amp;#39; exists and what kind of file it is.">getFileType</a>(path) == <a class="code" href="namespacePassenger.html#a14174b712df6046cb823cde43d7ef07dabb09dbba1071b4770913363db2462eee" title="A directory.">FT_DIRECTORY</a>;
-<a name="l00229"></a>00229 <span class="preprocessor">                #else</span>
-<a name="l00230"></a>00230 <span class="preprocessor"></span>                        <span class="keywordflow">return</span> entry-&gt;d_type == DT_DIR;
+<a name="l00224"></a>00224 <span class="preprocessor">                #ifdef DT_DIR</span>
+<a name="l00225"></a>00225 <span class="preprocessor"></span>                        <span class="keywordflow">if</span> (entry-&gt;d_type == DT_DIR) {
+<a name="l00226"></a>00226                                 <span class="keywordflow">return</span> <span class="keyword">true</span>;
+<a name="l00227"></a>00227                         } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (entry-&gt;d_type != DT_UNKNOWN) {
+<a name="l00228"></a>00228                                 <span class="keywordflow">return</span> <span class="keyword">false</span>;
+<a name="l00229"></a>00229                         }
+<a name="l00230"></a>00230                         <span class="comment">// If DT_UNKNOWN, use normal check.</span>
 <a name="l00231"></a>00231 <span class="preprocessor">                #endif</span>
-<a name="l00232"></a>00232 <span class="preprocessor"></span>        }
-<a name="l00233"></a>00233         
-<a name="l00234"></a>00234 <span class="keyword">public</span>:
-<a name="l00235"></a>00235         ServerInstanceDir(pid_t webServerPid, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;parentDir = <span class="stringliteral">&quot;&quot;</span>, <span class="keywordtype">bool</span> owner = <span class="keyword">true</span>) {
-<a name="l00236"></a>00236                 <span class="keywordtype">string</span> theParentDir;
-<a name="l00237"></a>00237                 
-<a name="l00238"></a>00238                 <span class="keywordflow">if</span> (parentDir.empty()) {
-<a name="l00239"></a>00239                         theParentDir = <a class="code" href="group__Support.html#ga68f4105c5a8e510520b5ea3eecb66213" title="Return the path name for the directory in which the system stores general temporary...">getSystemTempDir</a>();
-<a name="l00240"></a>00240                 } <span class="keywordflow">else</span> {
-<a name="l00241"></a>00241                         theParentDir = parentDir;
-<a name="l00242"></a>00242                 }
-<a name="l00243"></a>00243                 
-<a name="l00244"></a>00244                 <span class="comment">/* We embed the super structure version in the server instance directory name</span>
-<a name="l00245"></a>00245 <span class="comment">                 * because it&#39;s possible to upgrade Phusion Passenger without changing the</span>
-<a name="l00246"></a>00246 <span class="comment">                 * web server&#39;s PID. This way each incompatible upgrade will use its own</span>
-<a name="l00247"></a>00247 <span class="comment">                 * server instance directory.</span>
-<a name="l00248"></a>00248 <span class="comment">                 */</span>
-<a name="l00249"></a>00249                 initialize(theParentDir + <span class="stringliteral">&quot;/passenger.&quot;</span> +
-<a name="l00250"></a>00250                         toString(DIR_STRUCTURE_MAJOR_VERSION) + <span class="stringliteral">&quot;.&quot;</span> +
-<a name="l00251"></a>00251                         toString(DIR_STRUCTURE_MINOR_VERSION) + <span class="stringliteral">&quot;.&quot;</span> +
-<a name="l00252"></a>00252                         toString&lt;unsigned long long&gt;(webServerPid),
-<a name="l00253"></a>00253                         owner);
-<a name="l00254"></a>00254                 
-<a name="l00255"></a>00255         }
-<a name="l00256"></a>00256         
-<a name="l00257"></a>00257         ServerInstanceDir(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;path, <span class="keywordtype">bool</span> owner = <span class="keyword">true</span>) {
-<a name="l00258"></a>00258                 initialize(path, owner);
+<a name="l00232"></a>00232 <span class="preprocessor"></span>                <span class="keywordtype">string</span> path = dir;
+<a name="l00233"></a>00233                 path.append(<span class="stringliteral">&quot;/&quot;</span>);
+<a name="l00234"></a>00234                 path.append(entry-&gt;d_name);
+<a name="l00235"></a>00235                 <span class="keywordflow">return</span> <a class="code" href="group__Support.html#ga15298b031377d3ecb80295bd5b1a8180" title="Check whether &amp;#39;filename&amp;#39; exists and what kind of file it is.">getFileType</a>(path) == <a class="code" href="namespacePassenger.html#a14174b712df6046cb823cde43d7ef07dabb09dbba1071b4770913363db2462eee" title="A directory.">FT_DIRECTORY</a>;
+<a name="l00236"></a>00236         }
+<a name="l00237"></a>00237         
+<a name="l00238"></a>00238 <span class="keyword">public</span>:
+<a name="l00239"></a>00239         ServerInstanceDir(pid_t webServerPid, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;parentDir = <span class="stringliteral">&quot;&quot;</span>, <span class="keywordtype">bool</span> owner = <span class="keyword">true</span>) {
+<a name="l00240"></a>00240                 <span class="keywordtype">string</span> theParentDir;
+<a name="l00241"></a>00241                 
+<a name="l00242"></a>00242                 <span class="keywordflow">if</span> (parentDir.empty()) {
+<a name="l00243"></a>00243                         theParentDir = <a class="code" href="group__Support.html#ga68f4105c5a8e510520b5ea3eecb66213" title="Return the path name for the directory in which the system stores general temporary...">getSystemTempDir</a>();
+<a name="l00244"></a>00244                 } <span class="keywordflow">else</span> {
+<a name="l00245"></a>00245                         theParentDir = parentDir;
+<a name="l00246"></a>00246                 }
+<a name="l00247"></a>00247                 
+<a name="l00248"></a>00248                 <span class="comment">/* We embed the super structure version in the server instance directory name</span>
+<a name="l00249"></a>00249 <span class="comment">                 * because it&#39;s possible to upgrade Phusion Passenger without changing the</span>
+<a name="l00250"></a>00250 <span class="comment">                 * web server&#39;s PID. This way each incompatible upgrade will use its own</span>
+<a name="l00251"></a>00251 <span class="comment">                 * server instance directory.</span>
+<a name="l00252"></a>00252 <span class="comment">                 */</span>
+<a name="l00253"></a>00253                 initialize(theParentDir + <span class="stringliteral">&quot;/passenger.&quot;</span> +
+<a name="l00254"></a>00254                         toString(DIR_STRUCTURE_MAJOR_VERSION) + <span class="stringliteral">&quot;.&quot;</span> +
+<a name="l00255"></a>00255                         toString(DIR_STRUCTURE_MINOR_VERSION) + <span class="stringliteral">&quot;.&quot;</span> +
+<a name="l00256"></a>00256                         toString&lt;unsigned long long&gt;(webServerPid),
+<a name="l00257"></a>00257                         owner);
+<a name="l00258"></a>00258                 
 <a name="l00259"></a>00259         }
 <a name="l00260"></a>00260         
-<a name="l00261"></a>00261         ~ServerInstanceDir() {
-<a name="l00262"></a>00262                 <span class="keywordflow">if</span> (owner) {
-<a name="l00263"></a>00263                         GenerationPtr newestGeneration;
-<a name="l00264"></a>00264                         <span class="keywordflow">try</span> {
-<a name="l00265"></a>00265                                 newestGeneration = getNewestGeneration();
-<a name="l00266"></a>00266                         } <span class="keywordflow">catch</span> (<span class="keyword">const</span> FileSystemException &amp;e) {
-<a name="l00267"></a>00267                                 <span class="keywordflow">if</span> (e.code() == ENOENT) {
-<a name="l00268"></a>00268                                         <span class="keywordflow">return</span>;
-<a name="l00269"></a>00269                                 } <span class="keywordflow">else</span> {
-<a name="l00270"></a>00270                                         <span class="keywordflow">throw</span>;
-<a name="l00271"></a>00271                                 }
-<a name="l00272"></a>00272                         }
-<a name="l00273"></a>00273                         <span class="keywordflow">if</span> (newestGeneration == NULL) {
-<a name="l00274"></a>00274                                 <a class="code" href="namespacePassenger.html#a8422d210cbd2f62d21254415b5a7f747" title="Remove an entire directory tree recursively.">removeDirTree</a>(path);
-<a name="l00275"></a>00275                         }
-<a name="l00276"></a>00276                 }
-<a name="l00277"></a>00277         }
-<a name="l00278"></a>00278         
-<a name="l00279"></a>00279         <span class="keywordtype">string</span> getPath()<span class="keyword"> const </span>{
-<a name="l00280"></a>00280                 <span class="keywordflow">return</span> path;
+<a name="l00261"></a>00261         ServerInstanceDir(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;path, <span class="keywordtype">bool</span> owner = <span class="keyword">true</span>) {
+<a name="l00262"></a>00262                 initialize(path, owner);
+<a name="l00263"></a>00263         }
+<a name="l00264"></a>00264         
+<a name="l00265"></a>00265         ~ServerInstanceDir() {
+<a name="l00266"></a>00266                 <span class="keywordflow">if</span> (owner) {
+<a name="l00267"></a>00267                         GenerationPtr newestGeneration;
+<a name="l00268"></a>00268                         <span class="keywordflow">try</span> {
+<a name="l00269"></a>00269                                 newestGeneration = getNewestGeneration();
+<a name="l00270"></a>00270                         } <span class="keywordflow">catch</span> (<span class="keyword">const</span> FileSystemException &amp;e) {
+<a name="l00271"></a>00271                                 <span class="keywordflow">if</span> (e.code() == ENOENT) {
+<a name="l00272"></a>00272                                         <span class="keywordflow">return</span>;
+<a name="l00273"></a>00273                                 } <span class="keywordflow">else</span> {
+<a name="l00274"></a>00274                                         <span class="keywordflow">throw</span>;
+<a name="l00275"></a>00275                                 }
+<a name="l00276"></a>00276                         }
+<a name="l00277"></a>00277                         <span class="keywordflow">if</span> (newestGeneration == NULL) {
+<a name="l00278"></a>00278                                 <a class="code" href="namespacePassenger.html#a8422d210cbd2f62d21254415b5a7f747" title="Remove an entire directory tree recursively.">removeDirTree</a>(path);
+<a name="l00279"></a>00279                         }
+<a name="l00280"></a>00280                 }
 <a name="l00281"></a>00281         }
 <a name="l00282"></a>00282         
-<a name="l00283"></a>00283         <span class="keywordtype">void</span> detach() {
-<a name="l00284"></a>00284                 owner = <span class="keyword">false</span>;
+<a name="l00283"></a>00283         <span class="keywordtype">string</span> getPath()<span class="keyword"> const </span>{
+<a name="l00284"></a>00284                 <span class="keywordflow">return</span> path;
 <a name="l00285"></a>00285         }
 <a name="l00286"></a>00286         
-<a name="l00287"></a>00287         GenerationPtr newGeneration(<span class="keywordtype">bool</span> userSwitching, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;defaultUser,
-<a name="l00288"></a>00288                                     <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;defaultGroup, uid_t webServerWorkerUid,
-<a name="l00289"></a>00289                                     gid_t webServerWorkerGid)
-<a name="l00290"></a>00290         {
-<a name="l00291"></a>00291                 GenerationPtr newestGeneration = getNewestGeneration();
-<a name="l00292"></a>00292                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> newNumber;
-<a name="l00293"></a>00293                 <span class="keywordflow">if</span> (newestGeneration != NULL) {
-<a name="l00294"></a>00294                         newNumber = newestGeneration-&gt;getNumber() + 1;
-<a name="l00295"></a>00295                 } <span class="keywordflow">else</span> {
-<a name="l00296"></a>00296                         newNumber = 0;
-<a name="l00297"></a>00297                 }
-<a name="l00298"></a>00298                 
-<a name="l00299"></a>00299                 GenerationPtr generation(<span class="keyword">new</span> Generation(path, newNumber));
-<a name="l00300"></a>00300                 generation-&gt;create(userSwitching, defaultUser, defaultGroup,
-<a name="l00301"></a>00301                         webServerWorkerUid, webServerWorkerGid);
-<a name="l00302"></a>00302                 <span class="keywordflow">return</span> generation;
-<a name="l00303"></a>00303         }
-<a name="l00304"></a>00304         
-<a name="l00305"></a>00305         GenerationPtr getGeneration(<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> number)<span class="keyword"> const </span>{
-<a name="l00306"></a>00306                 <span class="keywordflow">return</span> <a class="code" href="group__Support.html#ga41b6c4a82fed72531a147de0505a8396" title="Convenience shortcut for creating a shared_ptr.">ptr</a>(<span class="keyword">new</span> Generation(path, number));
+<a name="l00287"></a>00287         <span class="keywordtype">void</span> detach() {
+<a name="l00288"></a>00288                 owner = <span class="keyword">false</span>;
+<a name="l00289"></a>00289         }
+<a name="l00290"></a>00290         
+<a name="l00291"></a>00291         GenerationPtr newGeneration(<span class="keywordtype">bool</span> userSwitching, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;defaultUser,
+<a name="l00292"></a>00292                                     <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;defaultGroup, uid_t webServerWorkerUid,
+<a name="l00293"></a>00293                                     gid_t webServerWorkerGid)
+<a name="l00294"></a>00294         {
+<a name="l00295"></a>00295                 GenerationPtr newestGeneration = getNewestGeneration();
+<a name="l00296"></a>00296                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> newNumber;
+<a name="l00297"></a>00297                 <span class="keywordflow">if</span> (newestGeneration != NULL) {
+<a name="l00298"></a>00298                         newNumber = newestGeneration-&gt;getNumber() + 1;
+<a name="l00299"></a>00299                 } <span class="keywordflow">else</span> {
+<a name="l00300"></a>00300                         newNumber = 0;
+<a name="l00301"></a>00301                 }
+<a name="l00302"></a>00302                 
+<a name="l00303"></a>00303                 GenerationPtr generation(<span class="keyword">new</span> Generation(path, newNumber));
+<a name="l00304"></a>00304                 generation-&gt;create(userSwitching, defaultUser, defaultGroup,
+<a name="l00305"></a>00305                         webServerWorkerUid, webServerWorkerGid);
+<a name="l00306"></a>00306                 <span class="keywordflow">return</span> generation;
 <a name="l00307"></a>00307         }
 <a name="l00308"></a>00308         
-<a name="l00309"></a>00309         GenerationPtr getNewestGeneration()<span class="keyword"> const </span>{
-<a name="l00310"></a>00310                 DIR *dir = opendir(path.c_str());
-<a name="l00311"></a>00311                 <span class="keyword">struct </span>dirent *entry;
-<a name="l00312"></a>00312                 <span class="keywordtype">int</span> result = -1;
-<a name="l00313"></a>00313                 
-<a name="l00314"></a>00314                 <span class="keywordflow">if</span> (dir == NULL) {
-<a name="l00315"></a>00315                         <span class="keywordtype">int</span> e = errno;
-<a name="l00316"></a>00316                         <span class="keywordflow">throw</span> FileSystemException(<span class="stringliteral">&quot;Cannot open directory &quot;</span> + path,
-<a name="l00317"></a>00317                                 e, path);
-<a name="l00318"></a>00318                 }
-<a name="l00319"></a>00319                 <span class="keywordflow">while</span> ((entry = readdir(dir)) != NULL) {
-<a name="l00320"></a>00320                         <span class="keywordflow">if</span> (isDirectory(path, entry)
-<a name="l00321"></a>00321                          &amp;&amp; strncmp(entry-&gt;d_name, <span class="stringliteral">&quot;generation-&quot;</span>, <span class="keyword">sizeof</span>(<span class="stringliteral">&quot;generation-&quot;</span>) - 1) == 0) {
-<a name="l00322"></a>00322                                 <span class="keyword">const</span> <span class="keywordtype">char</span> *numberString = entry-&gt;d_name + <span class="keyword">sizeof</span>(<span class="stringliteral">&quot;generation-&quot;</span>) - 1;
-<a name="l00323"></a>00323                                 <span class="keywordtype">int</span> number = atoi(numberString);
-<a name="l00324"></a>00324                                 <span class="keywordflow">if</span> (number &gt;= 0 &amp;&amp; number &gt; result) {
-<a name="l00325"></a>00325                                         result = number;
-<a name="l00326"></a>00326                                 }
-<a name="l00327"></a>00327                         }
-<a name="l00328"></a>00328                 }
-<a name="l00329"></a>00329                 closedir(dir);
-<a name="l00330"></a>00330                 
-<a name="l00331"></a>00331                 <span class="keywordflow">if</span> (result == -1) {
-<a name="l00332"></a>00332                         <span class="keywordflow">return</span> GenerationPtr();
-<a name="l00333"></a>00333                 } <span class="keywordflow">else</span> {
-<a name="l00334"></a>00334                         <span class="keywordflow">return</span> getGeneration(result);
-<a name="l00335"></a>00335                 }
-<a name="l00336"></a>00336         }
-<a name="l00337"></a>00337 };
-<a name="l00338"></a>00338 
-<a name="l00339"></a>00339 <span class="keyword">typedef</span> shared_ptr&lt;ServerInstanceDir&gt; ServerInstanceDirPtr;
-<a name="l00340"></a>00340 
-<a name="l00341"></a>00341 } <span class="comment">// namespace Passenger</span>
+<a name="l00309"></a>00309         GenerationPtr getGeneration(<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> number)<span class="keyword"> const </span>{
+<a name="l00310"></a>00310                 <span class="keywordflow">return</span> <a class="code" href="group__Support.html#ga41b6c4a82fed72531a147de0505a8396" title="Convenience shortcut for creating a shared_ptr.">ptr</a>(<span class="keyword">new</span> Generation(path, number));
+<a name="l00311"></a>00311         }
+<a name="l00312"></a>00312         
+<a name="l00313"></a>00313         GenerationPtr getNewestGeneration()<span class="keyword"> const </span>{
+<a name="l00314"></a>00314                 DIR *dir = opendir(path.c_str());
+<a name="l00315"></a>00315                 <span class="keyword">struct </span>dirent *entry;
+<a name="l00316"></a>00316                 <span class="keywordtype">int</span> result = -1;
+<a name="l00317"></a>00317                 
+<a name="l00318"></a>00318                 <span class="keywordflow">if</span> (dir == NULL) {
+<a name="l00319"></a>00319                         <span class="keywordtype">int</span> e = errno;
+<a name="l00320"></a>00320                         <span class="keywordflow">throw</span> FileSystemException(<span class="stringliteral">&quot;Cannot open directory &quot;</span> + path,
+<a name="l00321"></a>00321                                 e, path);
+<a name="l00322"></a>00322                 }
+<a name="l00323"></a>00323                 <span class="keywordflow">while</span> ((entry = readdir(dir)) != NULL) {
+<a name="l00324"></a>00324                         <span class="keywordflow">if</span> (isDirectory(path, entry)
+<a name="l00325"></a>00325                          &amp;&amp; strncmp(entry-&gt;d_name, <span class="stringliteral">&quot;generation-&quot;</span>, <span class="keyword">sizeof</span>(<span class="stringliteral">&quot;generation-&quot;</span>) - 1) == 0) {
+<a name="l00326"></a>00326                                 <span class="keyword">const</span> <span class="keywordtype">char</span> *numberString = entry-&gt;d_name + <span class="keyword">sizeof</span>(<span class="stringliteral">&quot;generation-&quot;</span>) - 1;
+<a name="l00327"></a>00327                                 <span class="keywordtype">int</span> number = atoi(numberString);
+<a name="l00328"></a>00328                                 <span class="keywordflow">if</span> (number &gt;= 0 &amp;&amp; number &gt; result) {
+<a name="l00329"></a>00329                                         result = number;
+<a name="l00330"></a>00330                                 }
+<a name="l00331"></a>00331                         }
+<a name="l00332"></a>00332                 }
+<a name="l00333"></a>00333                 closedir(dir);
+<a name="l00334"></a>00334                 
+<a name="l00335"></a>00335                 <span class="keywordflow">if</span> (result == -1) {
+<a name="l00336"></a>00336                         <span class="keywordflow">return</span> GenerationPtr();
+<a name="l00337"></a>00337                 } <span class="keywordflow">else</span> {
+<a name="l00338"></a>00338                         <span class="keywordflow">return</span> getGeneration(result);
+<a name="l00339"></a>00339                 }
+<a name="l00340"></a>00340         }
+<a name="l00341"></a>00341 };
 <a name="l00342"></a>00342 
-<a name="l00343"></a>00343 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_SERVER_INSTANCE_DIR_H_ */</span>
+<a name="l00343"></a>00343 <span class="keyword">typedef</span> shared_ptr&lt;ServerInstanceDir&gt; ServerInstanceDirPtr;
+<a name="l00344"></a>00344 
+<a name="l00345"></a>00345 } <span class="comment">// namespace Passenger</span>
+<a name="l00346"></a>00346 
+<a name="l00347"></a>00347 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_SERVER_INSTANCE_DIR_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/Session_8h_source.html

@@ -228,7 +228,7 @@
 <a name="l00203"></a>00203                                 <span class="stringliteral">&quot;already been closed or discarded.&quot;</span>);
 <a name="l00204"></a>00204                 }
 <a name="l00205"></a>00205                 <span class="keywordflow">try</span> {
-<a name="l00206"></a>00206                         <a class="code" href="classPassenger_1_1MessageChannel.html" title="Convenience class for I/O operations on file descriptors.">MessageChannel</a>(stream).writeRaw(block, size);
+<a name="l00206"></a>00206                         writeExact(stream, block, size);
 <a name="l00207"></a>00207                 } <span class="keywordflow">catch</span> (<a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a> &amp;e) {
 <a name="l00208"></a>00208                         e.setBriefMessage(<span class="stringliteral">&quot;An error occured while sending the &quot;</span>
 <a name="l00209"></a>00209                                 <span class="stringliteral">&quot;request body to the request handler&quot;</span>);

data/doc/cxxapi/SpawnManager_8h_source.html

@@ -81,200 +81,200 @@
 <a name="l00056"></a>00056 <span class="preprocessor">#include &quot;Logging.h&quot;</span>
 <a name="l00057"></a>00057 <span class="preprocessor">#include &quot;Utils/Base64.h&quot;</span>
 <a name="l00058"></a>00058 <span class="preprocessor">#include &quot;Utils/SystemTime.h&quot;</span>
-<a name="l00059"></a>00059 
-<a name="l00060"></a>00060 <span class="keyword">namespace </span>Passenger {
-<a name="l00061"></a>00061 
-<a name="l00062"></a>00062 <span class="keyword">using namespace </span>std;
-<a name="l00063"></a>00063 <span class="keyword">using namespace </span>boost;
-<a name="l00064"></a>00064 <span class="keyword">using namespace </span>oxt;
-<a name="l00065"></a>00065 <span class="comment"></span>
-<a name="l00066"></a>00066 <span class="comment">/**</span>
-<a name="l00067"></a>00067 <span class="comment"> * An AbstractSpawnManager implementation.</span>
-<a name="l00068"></a>00068 <span class="comment"> *</span>
-<a name="l00069"></a>00069 <span class="comment"> * Internally, this class makes use of a spawn server, which is written in Ruby. This server</span>
-<a name="l00070"></a>00070 <span class="comment"> * is automatically started when a SpawnManager instance is created, and automatically</span>
-<a name="l00071"></a>00071 <span class="comment"> * shutdown when that instance is destroyed. The existance of the spawn server is almost</span>
-<a name="l00072"></a>00072 <span class="comment"> * totally transparent to users of this class. Spawn requests are sent to the server,</span>
-<a name="l00073"></a>00073 <span class="comment"> * and details about the spawned process is returned.</span>
-<a name="l00074"></a>00074 <span class="comment"> *</span>
-<a name="l00075"></a>00075 <span class="comment"> * If the spawn server dies during the middle of an operation, it will be restarted.</span>
-<a name="l00076"></a>00076 <span class="comment"> * See spawn() for full details.</span>
-<a name="l00077"></a>00077 <span class="comment"> *</span>
-<a name="l00078"></a>00078 <span class="comment"> * The communication channel with the server is anonymous, i.e. no other processes</span>
-<a name="l00079"></a>00079 <span class="comment"> * can access the communication channel, so communication is guaranteed to be safe</span>
-<a name="l00080"></a>00080 <span class="comment"> * (unless, of course, if the spawn server itself is a trojan).</span>
-<a name="l00081"></a>00081 <span class="comment"> *</span>
-<a name="l00082"></a><a class="code" href="classPassenger_1_1SpawnManager.html">00082</a> <span class="comment"> * The server will try to keep the spawning time as small as possible, by keeping</span>
-<a name="l00083"></a>00083 <span class="comment"> * corresponding Ruby on Rails frameworks and application code in memory. So the second</span>
-<a name="l00084"></a>00084 <span class="comment"> * time a process of the same application is spawned, the spawn time is significantly</span>
-<a name="l00085"></a>00085 <span class="comment"> * lower than the first time. Nevertheless, spawning is a relatively expensive operation</span>
-<a name="l00086"></a>00086 <span class="comment"> * (compared to the processing of a typical HTTP request/response), and so should be</span>
-<a name="l00087"></a>00087 <span class="comment"> * avoided whenever possible.</span>
-<a name="l00088"></a>00088 <span class="comment"> *</span>
-<a name="l00089"></a>00089 <span class="comment"> * See the documentation of the spawn server for full implementation details.</span>
-<a name="l00090"></a>00090 <span class="comment"> *</span>
-<a name="l00091"></a>00091 <span class="comment"> * @ingroup Support</span>
-<a name="l00092"></a>00092 <span class="comment"> */</span>
-<a name="l00093"></a>00093 <span class="keyword">class </span><a class="code" href="classPassenger_1_1SpawnManager.html" title="An AbstractSpawnManager implementation.">SpawnManager</a>: <span class="keyword">public</span> <a class="code" href="classPassenger_1_1AbstractSpawnManager.html" title="Spawning of application processes.">AbstractSpawnManager</a> {
-<a name="l00094"></a>00094 <span class="keyword">private</span>:
-<a name="l00095"></a>00095         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> SERVER_SOCKET_FD = 3;
-<a name="l00096"></a>00096         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> OWNER_SOCKET_FD  = 4;
-<a name="l00097"></a>00097         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> HIGHEST_FD       = OWNER_SOCKET_FD;
-<a name="l00098"></a>00098 
-<a name="l00099"></a>00099         <span class="keywordtype">string</span> spawnServerCommand;
-<a name="l00100"></a>00100         ServerInstanceDir::GenerationPtr generation;
-<a name="l00101"></a>00101         AccountsDatabasePtr accountsDatabase;
-<a name="l00102"></a>00102         <span class="keywordtype">string</span> rubyCommand;
-<a name="l00103"></a>00103         AnalyticsLoggerPtr analyticsLogger;
-<a name="l00104"></a>00104         <span class="keywordtype">int</span> logLevel;
-<a name="l00105"></a>00105         <span class="keywordtype">string</span> debugLogFile;
-<a name="l00106"></a>00106         
-<a name="l00107"></a>00107         boost::mutex lock;
-<a name="l00108"></a>00108         <a class="code" href="classPassenger_1_1RandomGenerator.html" title="A random data generator.">RandomGenerator</a> random;
-<a name="l00109"></a>00109         
-<a name="l00110"></a>00110         pid_t pid;
-<a name="l00111"></a>00111         <a class="code" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior.">FileDescriptor</a> ownerSocket;
-<a name="l00112"></a>00112         <span class="keywordtype">string</span> socketFilename;
-<a name="l00113"></a>00113         <span class="keywordtype">string</span> socketPassword;
-<a name="l00114"></a>00114         <span class="keywordtype">bool</span> serverNeedsRestart;
-<a name="l00115"></a>00115         
-<a name="l00116"></a>00116         <span class="keyword">static</span> <span class="keywordtype">void</span> deleteAccount(AccountsDatabasePtr accountsDatabase, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;username) {
-<a name="l00117"></a>00117                 accountsDatabase-&gt;remove(username);
-<a name="l00118"></a>00118         }
-<a name="l00119"></a>00119         <span class="comment"></span>
-<a name="l00120"></a>00120 <span class="comment">        /**</span>
-<a name="l00121"></a>00121 <span class="comment">         * Restarts the spawn server.</span>
-<a name="l00122"></a>00122 <span class="comment">         *</span>
-<a name="l00123"></a>00123 <span class="comment">         * @pre System call interruption is disabled.</span>
-<a name="l00124"></a>00124 <span class="comment">         * @throws RuntimeException An error occurred while creating a Unix server socket.</span>
-<a name="l00125"></a>00125 <span class="comment">         * @throws SystemException An error occured while trying to setup the spawn server.</span>
-<a name="l00126"></a>00126 <span class="comment">         * @throws IOException An error occurred while generating random data.</span>
-<a name="l00127"></a>00127 <span class="comment">         */</span>
-<a name="l00128"></a>00128         <span class="keywordtype">void</span> restartServer() {
-<a name="l00129"></a>00129                 TRACE_POINT();
-<a name="l00130"></a>00130                 <span class="keywordflow">if</span> (pid != 0) {
-<a name="l00131"></a>00131                         UPDATE_TRACE_POINT();
-<a name="l00132"></a>00132                         ownerSocket.<a class="code" href="classPassenger_1_1FileDescriptor.html#ad7c1a99531181878cbab74a7400c5432" title="Close the underlying file descriptor.">close</a>();
-<a name="l00133"></a>00133                         
-<a name="l00134"></a>00134                         <span class="comment">/* Wait at most 5 seconds for the spawn server to exit.</span>
-<a name="l00135"></a>00135 <span class="comment">                         * If that doesn&#39;t work, kill it, then wait at most 5 seconds</span>
-<a name="l00136"></a>00136 <span class="comment">                         * for it to exit.</span>
-<a name="l00137"></a>00137 <span class="comment">                         */</span>
-<a name="l00138"></a>00138                         time_t begin = syscalls::time(NULL);
-<a name="l00139"></a>00139                         <span class="keywordtype">bool</span> done = <span class="keyword">false</span>;
-<a name="l00140"></a>00140                         <span class="keywordflow">while</span> (!done &amp;&amp; syscalls::time(NULL) - begin &lt; 5) {
-<a name="l00141"></a>00141                                 <span class="keywordflow">if</span> (syscalls::waitpid(pid, NULL, WNOHANG) &gt; 0) {
-<a name="l00142"></a>00142                                         done = <span class="keyword">true</span>;
-<a name="l00143"></a>00143                                 } <span class="keywordflow">else</span> {
-<a name="l00144"></a>00144                                         syscalls::usleep(100000);
-<a name="l00145"></a>00145                                 }
-<a name="l00146"></a>00146                         }
-<a name="l00147"></a>00147                         UPDATE_TRACE_POINT();
-<a name="l00148"></a>00148                         <span class="keywordflow">if</span> (!done) {
-<a name="l00149"></a>00149                                 UPDATE_TRACE_POINT();
-<a name="l00150"></a>00150                                 P_TRACE(2, <span class="stringliteral">&quot;Spawn server did not exit in time, killing it...&quot;</span>);
-<a name="l00151"></a>00151                                 syscalls::kill(pid, SIGTERM);
-<a name="l00152"></a>00152                                 begin = syscalls::time(NULL);
-<a name="l00153"></a>00153                                 <span class="keywordflow">while</span> (syscalls::time(NULL) - begin &lt; 5) {
-<a name="l00154"></a>00154                                         <span class="keywordflow">if</span> (syscalls::waitpid(pid, NULL, WNOHANG) &gt; 0) {
-<a name="l00155"></a>00155                                                 <span class="keywordflow">break</span>;
-<a name="l00156"></a>00156                                         } <span class="keywordflow">else</span> {
-<a name="l00157"></a>00157                                                 syscalls::usleep(100000);
-<a name="l00158"></a>00158                                         }
-<a name="l00159"></a>00159                                 }
-<a name="l00160"></a>00160                         }
-<a name="l00161"></a>00161                         pid = 0;
-<a name="l00162"></a>00162                 }
-<a name="l00163"></a>00163                 
-<a name="l00164"></a>00164                 <a class="code" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior.">FileDescriptor</a> serverSocket;
-<a name="l00165"></a>00165                 <span class="keywordtype">string</span> socketFilename;
-<a name="l00166"></a>00166                 <span class="keywordtype">string</span> socketPassword;
-<a name="l00167"></a>00167                 <span class="keywordtype">int</span> ret, fds[2];
-<a name="l00168"></a>00168                 
-<a name="l00169"></a>00169                 UPDATE_TRACE_POINT();
-<a name="l00170"></a>00170                 socketFilename = generation-&gt;getPath() + <span class="stringliteral">&quot;/spawn-server/socket.&quot;</span> +
-<a name="l00171"></a>00171                         toString(getpid()) + <span class="stringliteral">&quot;.&quot;</span> +
-<a name="l00172"></a>00172                         pointerToIntString(<span class="keyword">this</span>);
-<a name="l00173"></a>00173                 socketPassword = Base64::encode(random.generateByteString(32));
-<a name="l00174"></a>00174                 serverSocket = createUnixServer(socketFilename.c_str());
-<a name="l00175"></a>00175                 <span class="keywordflow">do</span> {
-<a name="l00176"></a>00176                         ret = chmod(socketFilename.c_str(), S_IRUSR | S_IWUSR | S_IXUSR);
-<a name="l00177"></a>00177                 } <span class="keywordflow">while</span> (ret == -1 &amp;&amp; errno == EINTR);
-<a name="l00178"></a>00178                 <span class="keywordflow">if</span> (ret == -1) {
-<a name="l00179"></a>00179                         <span class="keywordtype">int</span> e = errno;
-<a name="l00180"></a>00180                         syscalls::unlink(socketFilename.c_str());
-<a name="l00181"></a>00181                         <span class="keywordflow">throw</span> <a class="code" href="classPassenger_1_1FileSystemException.html" title="A filesystem error, as returned by the operating system.">FileSystemException</a>(<span class="stringliteral">&quot;Cannot set permissions on &#39;&quot;</span> + socketFilename + <span class="stringliteral">&quot;&#39;&quot;</span>,
-<a name="l00182"></a>00182                                 e, socketFilename);
-<a name="l00183"></a>00183                 }
-<a name="l00184"></a>00184                 
-<a name="l00185"></a>00185                 <span class="keywordflow">if</span> (syscalls::socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
-<a name="l00186"></a>00186                         <span class="keywordtype">int</span> e = errno;
-<a name="l00187"></a>00187                         syscalls::unlink(socketFilename.c_str());
-<a name="l00188"></a>00188                         <span class="keywordflow">throw</span> <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a>(<span class="stringliteral">&quot;Cannot create a Unix socket&quot;</span>, e);
-<a name="l00189"></a>00189                 }
-<a name="l00190"></a>00190 
-<a name="l00191"></a>00191                 UPDATE_TRACE_POINT();
-<a name="l00192"></a>00192                 pid = syscalls::fork();
-<a name="l00193"></a>00193                 <span class="keywordflow">if</span> (pid == 0) {
-<a name="l00194"></a>00194                         dup2(serverSocket, HIGHEST_FD + 1);
-<a name="l00195"></a>00195                         dup2(fds[1], HIGHEST_FD + 2);
-<a name="l00196"></a>00196                         dup2(HIGHEST_FD + 1, SERVER_SOCKET_FD);
-<a name="l00197"></a>00197                         dup2(HIGHEST_FD + 2, OWNER_SOCKET_FD);
-<a name="l00198"></a>00198                         
-<a name="l00199"></a>00199                         <span class="comment">// Close all unnecessary file descriptors</span>
-<a name="l00200"></a>00200                         <span class="keywordflow">for</span> (<span class="keywordtype">long</span> i = sysconf(_SC_OPEN_MAX) - 1; i &gt; HIGHEST_FD; i--) {
-<a name="l00201"></a>00201                                 close(i);
-<a name="l00202"></a>00202                         }
-<a name="l00203"></a>00203                         
-<a name="l00204"></a>00204                         execlp(rubyCommand.c_str(),
-<a name="l00205"></a>00205                                 rubyCommand.c_str(),
-<a name="l00206"></a>00206                                 spawnServerCommand.c_str(),
-<a name="l00207"></a>00207                                 <span class="comment">/* The spawn server changes the process names of the subservers</span>
-<a name="l00208"></a>00208 <span class="comment">                                 * that it starts, for better usability. However, the process name length</span>
-<a name="l00209"></a>00209 <span class="comment">                                 * (as shown by ps) is limited. Here, we try to expand that limit by</span>
-<a name="l00210"></a>00210 <span class="comment">                                 * deliberately passing a useless whitespace string to the spawn server.</span>
-<a name="l00211"></a>00211 <span class="comment">                                 * This argument is ignored by the spawn server. This works on some</span>
-<a name="l00212"></a>00212 <span class="comment">                                 * systems, such as Ubuntu Linux.</span>
-<a name="l00213"></a>00213 <span class="comment">                                 */</span>
-<a name="l00214"></a>00214                                 <span class="stringliteral">&quot;                                                             &quot;</span>,
-<a name="l00215"></a>00215                                 (<span class="keywordtype">char</span> *) NULL);
-<a name="l00216"></a>00216                         <span class="keywordtype">int</span> e = errno;
-<a name="l00217"></a>00217                         fprintf(stderr, <span class="stringliteral">&quot;*** Passenger ERROR (%s:%d):\n&quot;</span>
-<a name="l00218"></a>00218                                 <span class="stringliteral">&quot;Could not start the spawn server: %s: %s (%d)\n&quot;</span>,
-<a name="l00219"></a>00219                                 __FILE__, __LINE__,
-<a name="l00220"></a>00220                                 rubyCommand.c_str(), strerror(e), e);
-<a name="l00221"></a>00221                         fflush(stderr);
-<a name="l00222"></a>00222                         _exit(1);
-<a name="l00223"></a>00223                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (pid == -1) {
-<a name="l00224"></a>00224                         <span class="keywordtype">int</span> e = errno;
-<a name="l00225"></a>00225                         syscalls::unlink(socketFilename.c_str());
-<a name="l00226"></a>00226                         syscalls::close(fds[0]);
-<a name="l00227"></a>00227                         syscalls::close(fds[1]);
-<a name="l00228"></a>00228                         pid = 0;
-<a name="l00229"></a>00229                         <span class="keywordflow">throw</span> <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a>(<span class="stringliteral">&quot;Unable to fork a process&quot;</span>, e);
-<a name="l00230"></a>00230                 } <span class="keywordflow">else</span> {
-<a name="l00231"></a>00231                         <a class="code" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior.">FileDescriptor</a> ownerSocket = fds[0];
-<a name="l00232"></a>00232                         syscalls::close(fds[1]);
-<a name="l00233"></a>00233                         serverSocket.close();
-<a name="l00234"></a>00234                         
-<a name="l00235"></a>00235                         <span class="comment">// Pass arguments to spawn server.</span>
-<a name="l00236"></a>00236                         <a class="code" href="classPassenger_1_1MessageChannel.html" title="Convenience class for I/O operations on file descriptors.">MessageChannel</a> ownerSocketChannel(ownerSocket);
-<a name="l00237"></a>00237                         ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(socketFilename + <span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00238"></a>00238                         ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(socketPassword + <span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00239"></a>00239                         ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(generation-&gt;getPath() + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00059"></a>00059 <span class="preprocessor">#include &quot;Utils/IOUtils.h&quot;</span>
+<a name="l00060"></a>00060 
+<a name="l00061"></a>00061 <span class="keyword">namespace </span>Passenger {
+<a name="l00062"></a>00062 
+<a name="l00063"></a>00063 <span class="keyword">using namespace </span>std;
+<a name="l00064"></a>00064 <span class="keyword">using namespace </span>boost;
+<a name="l00065"></a>00065 <span class="keyword">using namespace </span>oxt;
+<a name="l00066"></a>00066 <span class="comment"></span>
+<a name="l00067"></a>00067 <span class="comment">/**</span>
+<a name="l00068"></a>00068 <span class="comment"> * An AbstractSpawnManager implementation.</span>
+<a name="l00069"></a>00069 <span class="comment"> *</span>
+<a name="l00070"></a>00070 <span class="comment"> * Internally, this class makes use of a spawn server, which is written in Ruby. This server</span>
+<a name="l00071"></a>00071 <span class="comment"> * is automatically started when a SpawnManager instance is created, and automatically</span>
+<a name="l00072"></a>00072 <span class="comment"> * shutdown when that instance is destroyed. The existance of the spawn server is almost</span>
+<a name="l00073"></a>00073 <span class="comment"> * totally transparent to users of this class. Spawn requests are sent to the server,</span>
+<a name="l00074"></a>00074 <span class="comment"> * and details about the spawned process is returned.</span>
+<a name="l00075"></a>00075 <span class="comment"> *</span>
+<a name="l00076"></a>00076 <span class="comment"> * If the spawn server dies during the middle of an operation, it will be restarted.</span>
+<a name="l00077"></a>00077 <span class="comment"> * See spawn() for full details.</span>
+<a name="l00078"></a>00078 <span class="comment"> *</span>
+<a name="l00079"></a>00079 <span class="comment"> * The communication channel with the server is anonymous, i.e. no other processes</span>
+<a name="l00080"></a>00080 <span class="comment"> * can access the communication channel, so communication is guaranteed to be safe</span>
+<a name="l00081"></a>00081 <span class="comment"> * (unless, of course, if the spawn server itself is a trojan).</span>
+<a name="l00082"></a><a class="code" href="classPassenger_1_1SpawnManager.html">00082</a> <span class="comment"> *</span>
+<a name="l00083"></a>00083 <span class="comment"> * The server will try to keep the spawning time as small as possible, by keeping</span>
+<a name="l00084"></a>00084 <span class="comment"> * corresponding Ruby on Rails frameworks and application code in memory. So the second</span>
+<a name="l00085"></a>00085 <span class="comment"> * time a process of the same application is spawned, the spawn time is significantly</span>
+<a name="l00086"></a>00086 <span class="comment"> * lower than the first time. Nevertheless, spawning is a relatively expensive operation</span>
+<a name="l00087"></a>00087 <span class="comment"> * (compared to the processing of a typical HTTP request/response), and so should be</span>
+<a name="l00088"></a>00088 <span class="comment"> * avoided whenever possible.</span>
+<a name="l00089"></a>00089 <span class="comment"> *</span>
+<a name="l00090"></a>00090 <span class="comment"> * See the documentation of the spawn server for full implementation details.</span>
+<a name="l00091"></a>00091 <span class="comment"> *</span>
+<a name="l00092"></a>00092 <span class="comment"> * @ingroup Support</span>
+<a name="l00093"></a>00093 <span class="comment"> */</span>
+<a name="l00094"></a>00094 <span class="keyword">class </span><a class="code" href="classPassenger_1_1SpawnManager.html" title="An AbstractSpawnManager implementation.">SpawnManager</a>: <span class="keyword">public</span> <a class="code" href="classPassenger_1_1AbstractSpawnManager.html" title="Spawning of application processes.">AbstractSpawnManager</a> {
+<a name="l00095"></a>00095 <span class="keyword">private</span>:
+<a name="l00096"></a>00096         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> SERVER_SOCKET_FD = 3;
+<a name="l00097"></a>00097         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> OWNER_SOCKET_FD  = 4;
+<a name="l00098"></a>00098         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> HIGHEST_FD       = OWNER_SOCKET_FD;
+<a name="l00099"></a>00099 
+<a name="l00100"></a>00100         <span class="keywordtype">string</span> spawnServerCommand;
+<a name="l00101"></a>00101         ServerInstanceDir::GenerationPtr generation;
+<a name="l00102"></a>00102         AccountsDatabasePtr accountsDatabase;
+<a name="l00103"></a>00103         <span class="keywordtype">string</span> rubyCommand;
+<a name="l00104"></a>00104         AnalyticsLoggerPtr analyticsLogger;
+<a name="l00105"></a>00105         <span class="keywordtype">int</span> logLevel;
+<a name="l00106"></a>00106         <span class="keywordtype">string</span> debugLogFile;
+<a name="l00107"></a>00107         
+<a name="l00108"></a>00108         boost::mutex lock;
+<a name="l00109"></a>00109         <a class="code" href="classPassenger_1_1RandomGenerator.html" title="A random data generator.">RandomGenerator</a> random;
+<a name="l00110"></a>00110         
+<a name="l00111"></a>00111         pid_t pid;
+<a name="l00112"></a>00112         <a class="code" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior.">FileDescriptor</a> ownerSocket;
+<a name="l00113"></a>00113         <span class="keywordtype">string</span> socketFilename;
+<a name="l00114"></a>00114         <span class="keywordtype">string</span> socketPassword;
+<a name="l00115"></a>00115         <span class="keywordtype">bool</span> serverNeedsRestart;
+<a name="l00116"></a>00116         
+<a name="l00117"></a>00117         <span class="keyword">static</span> <span class="keywordtype">void</span> deleteAccount(AccountsDatabasePtr accountsDatabase, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;username) {
+<a name="l00118"></a>00118                 accountsDatabase-&gt;remove(username);
+<a name="l00119"></a>00119         }
+<a name="l00120"></a>00120         <span class="comment"></span>
+<a name="l00121"></a>00121 <span class="comment">        /**</span>
+<a name="l00122"></a>00122 <span class="comment">         * Restarts the spawn server.</span>
+<a name="l00123"></a>00123 <span class="comment">         *</span>
+<a name="l00124"></a>00124 <span class="comment">         * @pre System call interruption is disabled.</span>
+<a name="l00125"></a>00125 <span class="comment">         * @throws RuntimeException An error occurred while creating a Unix server socket.</span>
+<a name="l00126"></a>00126 <span class="comment">         * @throws SystemException An error occured while trying to setup the spawn server.</span>
+<a name="l00127"></a>00127 <span class="comment">         * @throws IOException An error occurred while generating random data.</span>
+<a name="l00128"></a>00128 <span class="comment">         */</span>
+<a name="l00129"></a>00129         <span class="keywordtype">void</span> restartServer() {
+<a name="l00130"></a>00130                 TRACE_POINT();
+<a name="l00131"></a>00131                 <span class="keywordflow">if</span> (pid != 0) {
+<a name="l00132"></a>00132                         UPDATE_TRACE_POINT();
+<a name="l00133"></a>00133                         ownerSocket.<a class="code" href="classPassenger_1_1FileDescriptor.html#a02062f3cfb689b32781e11114c0abe5b" title="Close the underlying file descriptor.">close</a>();
+<a name="l00134"></a>00134                         
+<a name="l00135"></a>00135                         <span class="comment">/* Wait at most 5 seconds for the spawn server to exit.</span>
+<a name="l00136"></a>00136 <span class="comment">                         * If that doesn&#39;t work, kill it, then wait at most 5 seconds</span>
+<a name="l00137"></a>00137 <span class="comment">                         * for it to exit.</span>
+<a name="l00138"></a>00138 <span class="comment">                         */</span>
+<a name="l00139"></a>00139                         time_t begin = syscalls::time(NULL);
+<a name="l00140"></a>00140                         <span class="keywordtype">bool</span> done = <span class="keyword">false</span>;
+<a name="l00141"></a>00141                         <span class="keywordflow">while</span> (!done &amp;&amp; syscalls::time(NULL) - begin &lt; 5) {
+<a name="l00142"></a>00142                                 <span class="keywordflow">if</span> (syscalls::waitpid(pid, NULL, WNOHANG) &gt; 0) {
+<a name="l00143"></a>00143                                         done = <span class="keyword">true</span>;
+<a name="l00144"></a>00144                                 } <span class="keywordflow">else</span> {
+<a name="l00145"></a>00145                                         syscalls::usleep(100000);
+<a name="l00146"></a>00146                                 }
+<a name="l00147"></a>00147                         }
+<a name="l00148"></a>00148                         UPDATE_TRACE_POINT();
+<a name="l00149"></a>00149                         <span class="keywordflow">if</span> (!done) {
+<a name="l00150"></a>00150                                 UPDATE_TRACE_POINT();
+<a name="l00151"></a>00151                                 P_TRACE(2, <span class="stringliteral">&quot;Spawn server did not exit in time, killing it...&quot;</span>);
+<a name="l00152"></a>00152                                 syscalls::kill(pid, SIGTERM);
+<a name="l00153"></a>00153                                 begin = syscalls::time(NULL);
+<a name="l00154"></a>00154                                 <span class="keywordflow">while</span> (syscalls::time(NULL) - begin &lt; 5) {
+<a name="l00155"></a>00155                                         <span class="keywordflow">if</span> (syscalls::waitpid(pid, NULL, WNOHANG) &gt; 0) {
+<a name="l00156"></a>00156                                                 <span class="keywordflow">break</span>;
+<a name="l00157"></a>00157                                         } <span class="keywordflow">else</span> {
+<a name="l00158"></a>00158                                                 syscalls::usleep(100000);
+<a name="l00159"></a>00159                                         }
+<a name="l00160"></a>00160                                 }
+<a name="l00161"></a>00161                         }
+<a name="l00162"></a>00162                         pid = 0;
+<a name="l00163"></a>00163                 }
+<a name="l00164"></a>00164                 
+<a name="l00165"></a>00165                 <a class="code" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior.">FileDescriptor</a> serverSocket;
+<a name="l00166"></a>00166                 <span class="keywordtype">string</span> socketFilename;
+<a name="l00167"></a>00167                 <span class="keywordtype">string</span> socketPassword;
+<a name="l00168"></a>00168                 <span class="keywordtype">int</span> ret, fds[2];
+<a name="l00169"></a>00169                 
+<a name="l00170"></a>00170                 UPDATE_TRACE_POINT();
+<a name="l00171"></a>00171                 socketFilename = generation-&gt;getPath() + <span class="stringliteral">&quot;/spawn-server/socket.&quot;</span> +
+<a name="l00172"></a>00172                         toString(getpid()) + <span class="stringliteral">&quot;.&quot;</span> +
+<a name="l00173"></a>00173                         pointerToIntString(<span class="keyword">this</span>);
+<a name="l00174"></a>00174                 socketPassword = Base64::encode(random.generateByteString(32));
+<a name="l00175"></a>00175                 serverSocket = createUnixServer(socketFilename.c_str());
+<a name="l00176"></a>00176                 <span class="keywordflow">do</span> {
+<a name="l00177"></a>00177                         ret = chmod(socketFilename.c_str(), S_IRUSR | S_IWUSR | S_IXUSR);
+<a name="l00178"></a>00178                 } <span class="keywordflow">while</span> (ret == -1 &amp;&amp; errno == EINTR);
+<a name="l00179"></a>00179                 <span class="keywordflow">if</span> (ret == -1) {
+<a name="l00180"></a>00180                         <span class="keywordtype">int</span> e = errno;
+<a name="l00181"></a>00181                         syscalls::unlink(socketFilename.c_str());
+<a name="l00182"></a>00182                         <span class="keywordflow">throw</span> <a class="code" href="classPassenger_1_1FileSystemException.html" title="A filesystem error, as returned by the operating system.">FileSystemException</a>(<span class="stringliteral">&quot;Cannot set permissions on &#39;&quot;</span> + socketFilename + <span class="stringliteral">&quot;&#39;&quot;</span>,
+<a name="l00183"></a>00183                                 e, socketFilename);
+<a name="l00184"></a>00184                 }
+<a name="l00185"></a>00185                 
+<a name="l00186"></a>00186                 <span class="keywordflow">if</span> (syscalls::socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
+<a name="l00187"></a>00187                         <span class="keywordtype">int</span> e = errno;
+<a name="l00188"></a>00188                         syscalls::unlink(socketFilename.c_str());
+<a name="l00189"></a>00189                         <span class="keywordflow">throw</span> <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a>(<span class="stringliteral">&quot;Cannot create a Unix socket&quot;</span>, e);
+<a name="l00190"></a>00190                 }
+<a name="l00191"></a>00191 
+<a name="l00192"></a>00192                 UPDATE_TRACE_POINT();
+<a name="l00193"></a>00193                 pid = syscalls::fork();
+<a name="l00194"></a>00194                 <span class="keywordflow">if</span> (pid == 0) {
+<a name="l00195"></a>00195                         dup2(serverSocket, HIGHEST_FD + 1);
+<a name="l00196"></a>00196                         dup2(fds[1], HIGHEST_FD + 2);
+<a name="l00197"></a>00197                         dup2(HIGHEST_FD + 1, SERVER_SOCKET_FD);
+<a name="l00198"></a>00198                         dup2(HIGHEST_FD + 2, OWNER_SOCKET_FD);
+<a name="l00199"></a>00199                         
+<a name="l00200"></a>00200                         <span class="comment">// Close all unnecessary file descriptors</span>
+<a name="l00201"></a>00201                         <span class="keywordflow">for</span> (<span class="keywordtype">long</span> i = sysconf(_SC_OPEN_MAX) - 1; i &gt; HIGHEST_FD; i--) {
+<a name="l00202"></a>00202                                 close(i);
+<a name="l00203"></a>00203                         }
+<a name="l00204"></a>00204                         
+<a name="l00205"></a>00205                         execlp(rubyCommand.c_str(),
+<a name="l00206"></a>00206                                 rubyCommand.c_str(),
+<a name="l00207"></a>00207                                 spawnServerCommand.c_str(),
+<a name="l00208"></a>00208                                 <span class="comment">/* The spawn server changes the process names of the subservers</span>
+<a name="l00209"></a>00209 <span class="comment">                                 * that it starts, for better usability. However, the process name length</span>
+<a name="l00210"></a>00210 <span class="comment">                                 * (as shown by ps) is limited. Here, we try to expand that limit by</span>
+<a name="l00211"></a>00211 <span class="comment">                                 * deliberately passing a useless whitespace string to the spawn server.</span>
+<a name="l00212"></a>00212 <span class="comment">                                 * This argument is ignored by the spawn server. This works on some</span>
+<a name="l00213"></a>00213 <span class="comment">                                 * systems, such as Ubuntu Linux.</span>
+<a name="l00214"></a>00214 <span class="comment">                                 */</span>
+<a name="l00215"></a>00215                                 <span class="stringliteral">&quot;                                                             &quot;</span>,
+<a name="l00216"></a>00216                                 (<span class="keywordtype">char</span> *) NULL);
+<a name="l00217"></a>00217                         <span class="keywordtype">int</span> e = errno;
+<a name="l00218"></a>00218                         fprintf(stderr, <span class="stringliteral">&quot;*** Passenger ERROR (%s:%d):\n&quot;</span>
+<a name="l00219"></a>00219                                 <span class="stringliteral">&quot;Could not start the spawn server: %s: %s (%d)\n&quot;</span>,
+<a name="l00220"></a>00220                                 __FILE__, __LINE__,
+<a name="l00221"></a>00221                                 rubyCommand.c_str(), strerror(e), e);
+<a name="l00222"></a>00222                         fflush(stderr);
+<a name="l00223"></a>00223                         _exit(1);
+<a name="l00224"></a>00224                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (pid == -1) {
+<a name="l00225"></a>00225                         <span class="keywordtype">int</span> e = errno;
+<a name="l00226"></a>00226                         syscalls::unlink(socketFilename.c_str());
+<a name="l00227"></a>00227                         syscalls::close(fds[0]);
+<a name="l00228"></a>00228                         syscalls::close(fds[1]);
+<a name="l00229"></a>00229                         pid = 0;
+<a name="l00230"></a>00230                         <span class="keywordflow">throw</span> <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a>(<span class="stringliteral">&quot;Unable to fork a process&quot;</span>, e);
+<a name="l00231"></a>00231                 } <span class="keywordflow">else</span> {
+<a name="l00232"></a>00232                         <a class="code" href="classPassenger_1_1FileDescriptor.html" title="Wrapper class around a file descriptor integer, for RAII behavior.">FileDescriptor</a> ownerSocket = fds[0];
+<a name="l00233"></a>00233                         syscalls::close(fds[1]);
+<a name="l00234"></a>00234                         serverSocket.close();
+<a name="l00235"></a>00235                         
+<a name="l00236"></a>00236                         <span class="comment">// Pass arguments to spawn server.</span>
+<a name="l00237"></a>00237                         writeExact(ownerSocket, socketFilename + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00238"></a>00238                         writeExact(ownerSocket, socketPassword + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00239"></a>00239                         writeExact(ownerSocket, generation-&gt;getPath() + <span class="stringliteral">&quot;\n&quot;</span>);
 <a name="l00240"></a>00240                         <span class="keywordflow">if</span> (analyticsLogger != NULL) {
-<a name="l00241"></a>00241                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(analyticsLogger-&gt;getAddress() + <span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00242"></a>00242                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(analyticsLogger-&gt;getUsername() + <span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00243"></a>00243                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(Base64::encode(analyticsLogger-&gt;getPassword()) + <span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00244"></a>00244                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(analyticsLogger-&gt;getNodeName() + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00241"></a>00241                                 writeExact(ownerSocket, analyticsLogger-&gt;getAddress() + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00242"></a>00242                                 writeExact(ownerSocket, analyticsLogger-&gt;getUsername() + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00243"></a>00243                                 writeExact(ownerSocket, Base64::encode(analyticsLogger-&gt;getPassword()) + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00244"></a>00244                                 writeExact(ownerSocket, analyticsLogger-&gt;getNodeName() + <span class="stringliteral">&quot;\n&quot;</span>);
 <a name="l00245"></a>00245                         } <span class="keywordflow">else</span> {
-<a name="l00246"></a>00246                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(<span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00247"></a>00247                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(<span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00248"></a>00248                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(<span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00249"></a>00249                                 ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(<span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00246"></a>00246                                 writeExact(ownerSocket, <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00247"></a>00247                                 writeExact(ownerSocket, <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00248"></a>00248                                 writeExact(ownerSocket, <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00249"></a>00249                                 writeExact(ownerSocket, <span class="stringliteral">&quot;\n&quot;</span>);
 <a name="l00250"></a>00250                         }
-<a name="l00251"></a>00251                         ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(toString(logLevel) + <span class="stringliteral">&quot;\n&quot;</span>);
-<a name="l00252"></a>00252                         ownerSocketChannel.<a class="code" href="classPassenger_1_1MessageChannel.html#a069314e4c7e1fe8c8ab36e16d2cc5fef" title="Send a block of data over the underlying file descriptor.">writeRaw</a>(debugLogFile + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00251"></a>00251                         writeExact(ownerSocket, toString(logLevel) + <span class="stringliteral">&quot;\n&quot;</span>);
+<a name="l00252"></a>00252                         writeExact(ownerSocket, debugLogFile + <span class="stringliteral">&quot;\n&quot;</span>);
 <a name="l00253"></a>00253                         
 <a name="l00254"></a>00254                         this-&gt;ownerSocket    = ownerSocket;
 <a name="l00255"></a>00255                         this-&gt;socketFilename = socketFilename;
@@ -523,8 +523,8 @@
 <a name="l00498"></a>00498         }
 <a name="l00499"></a>00499         
 <a name="l00500"></a>00500         <a class="code" href="classPassenger_1_1IOException.html" title="Represents an error that occured during an I/O operation.">IOException</a> prependMessageToException(<span class="keyword">const</span> <a class="code" href="classPassenger_1_1IOException.html" title="Represents an error that occured during an I/O operation.">IOException</a> &amp;e, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;message) {
-<a name="l00501"></a>00501                 <span class="keywordflow">return</span> <a class="code" href="classPassenger_1_1IOException.html" title="Represents an error that occured during an I/O operation.">IOException</a>(message + <span class="stringliteral">&quot;: &quot;</span> + e.what());
-<a name="l00502"></a><a class="code" href="classPassenger_1_1SpawnManager.html#ab4dfcb11c58b07d8144b18dd99abed45">00502</a>         }
+<a name="l00501"></a><a class="code" href="classPassenger_1_1SpawnManager.html#ab4dfcb11c58b07d8144b18dd99abed45">00501</a>                 <span class="keywordflow">return</span> <a class="code" href="classPassenger_1_1IOException.html" title="Represents an error that occured during an I/O operation.">IOException</a>(message + <span class="stringliteral">&quot;: &quot;</span> + e.what());
+<a name="l00502"></a>00502         }
 <a name="l00503"></a>00503         
 <a name="l00504"></a>00504         <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a> prependMessageToException(<span class="keyword">const</span> <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a> &amp;e, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;message) {
 <a name="l00505"></a>00505                 <span class="keywordflow">return</span> <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a>(message + <span class="stringliteral">&quot;: &quot;</span> + e.<a class="code" href="classPassenger_1_1SystemException.html#a84fa2ab4f5b7b96704734fcdfdaa0269" title="Returns a brief version of the exception message.">brief</a>(), e.<a class="code" href="classPassenger_1_1SystemException.html#aee7a6672bf79b72a4c3ee70c57d6a47c" title="The value of errno at the time the error occured.">code</a>());
@@ -542,8 +542,8 @@
 <a name="l00517"></a>00517 <span class="comment">         * Construct a new SpawnManager.</span>
 <a name="l00518"></a>00518 <span class="comment">         *</span>
 <a name="l00519"></a>00519 <span class="comment">         * @param spawnServerCommand The filename of the spawn server to use.</span>
-<a name="l00520"></a>00520 <span class="comment">         * @param generation The server instance dir generation in which</span>
-<a name="l00521"></a><a class="code" href="classPassenger_1_1SpawnManager.html#a50cf2d13d1a5ab8809108d3de7d9326b">00521</a> <span class="comment">         *                   generation-specific are stored.</span>
+<a name="l00520"></a><a class="code" href="classPassenger_1_1SpawnManager.html#a50cf2d13d1a5ab8809108d3de7d9326b">00520</a> <span class="comment">         * @param generation The server instance dir generation in which</span>
+<a name="l00521"></a>00521 <span class="comment">         *                   generation-specific are stored.</span>
 <a name="l00522"></a>00522 <span class="comment">         * @param accountsDatabase An accounts database. SpawnManager will automatically</span>
 <a name="l00523"></a>00523 <span class="comment">         *                         create a new account for each spawned process, assigning</span>
 <a name="l00524"></a>00524 <span class="comment">         *                         it the rights as set in the PoolOptions object. This</span>
@@ -582,27 +582,27 @@
 <a name="l00557"></a>00557                 }
 <a name="l00558"></a>00558         }
 <a name="l00559"></a>00559         
-<a name="l00560"></a>00560         <span class="keyword">virtual</span> ~<a class="code" href="classPassenger_1_1SpawnManager.html" title="An AbstractSpawnManager implementation.">SpawnManager</a>() {
-<a name="l00561"></a><a class="code" href="classPassenger_1_1SpawnManager.html#a88a94ba4d41dab492cb1dc8a0f998973">00561</a>                 TRACE_POINT();
+<a name="l00560"></a><a class="code" href="classPassenger_1_1SpawnManager.html#a88a94ba4d41dab492cb1dc8a0f998973">00560</a>         <span class="keyword">virtual</span> ~<a class="code" href="classPassenger_1_1SpawnManager.html" title="An AbstractSpawnManager implementation.">SpawnManager</a>() {
+<a name="l00561"></a>00561                 TRACE_POINT();
 <a name="l00562"></a>00562                 <span class="keywordflow">if</span> (pid != 0) {
 <a name="l00563"></a>00563                         UPDATE_TRACE_POINT();
 <a name="l00564"></a>00564                         this_thread::disable_interruption di;
 <a name="l00565"></a>00565                         this_thread::disable_syscall_interruption dsi;
 <a name="l00566"></a>00566                         syscalls::unlink(socketFilename.c_str());
-<a name="l00567"></a>00567                         ownerSocket.<a class="code" href="classPassenger_1_1FileDescriptor.html#ad7c1a99531181878cbab74a7400c5432" title="Close the underlying file descriptor.">close</a>();
+<a name="l00567"></a>00567                         ownerSocket.<a class="code" href="classPassenger_1_1FileDescriptor.html#a02062f3cfb689b32781e11114c0abe5b" title="Close the underlying file descriptor.">close</a>();
 <a name="l00568"></a>00568                         syscalls::waitpid(pid, NULL, 0);
 <a name="l00569"></a>00569                 }
 <a name="l00570"></a>00570         }
 <a name="l00571"></a>00571         
-<a name="l00572"></a>00572         <span class="keyword">virtual</span> <a class="code" href="namespacePassenger.html#aced1f248465136b313c6dec5fe6ca492" title="Convenient alias for Process smart pointer.">ProcessPtr</a> <a class="code" href="classPassenger_1_1SpawnManager.html#a88a94ba4d41dab492cb1dc8a0f998973" title="Spawn a new application process.">spawn</a>(<span class="keyword">const</span> PoolOptions &amp;options) {
+<a name="l00572"></a>00572         <span class="keyword">virtual</span> <a class="code" href="namespacePassenger.html#aced1f248465136b313c6dec5fe6ca492" title="Convenient alias for Process smart pointer.">ProcessPtr</a> <a class="code" href="classPassenger_1_1SpawnManager.html#a88a94ba4d41dab492cb1dc8a0f998973" title="Spawn a new application process.">spawn</a>(<span class="keyword">const</span> <a class="code" href="structPassenger_1_1PoolOptions.html" title="This struct encapsulates information for ApplicationPool::get() and for SpawnManager::spawn()...">PoolOptions</a> &amp;options) {
 <a name="l00573"></a>00573                 TRACE_POINT();
-<a name="l00574"></a>00574                 AnalyticsScopeLog scope(options.log, <span class="stringliteral">&quot;spawn app process&quot;</span>);
+<a name="l00574"></a>00574                 AnalyticsScopeLog scope(options.<a class="code" href="structPassenger_1_1PoolOptions.html#ace54185a9981f103a036a7ac3e768612" title="An analytics log object to log things to.">log</a>, <span class="stringliteral">&quot;spawn app process&quot;</span>);
 <a name="l00575"></a>00575                 <a class="code" href="namespacePassenger.html#aced1f248465136b313c6dec5fe6ca492" title="Convenient alias for Process smart pointer.">ProcessPtr</a> result;
 <a name="l00576"></a>00576                 boost::mutex::scoped_lock l(lock);
 <a name="l00577"></a>00577                 
 <a name="l00578"></a>00578                 <span class="keywordflow">try</span> {
-<a name="l00579"></a>00579                         result = sendSpawnCommand(options);
-<a name="l00580"></a><a class="code" href="classPassenger_1_1SpawnManager.html#aad71b2ea9431f3286f23a6e6f80e0981">00580</a>                 } <span class="keywordflow">catch</span> (<span class="keyword">const</span> <a class="code" href="classPassenger_1_1SpawnException.html" title="Thrown when SpawnManager or ApplicationPool fails to spawn an application instance...">SpawnException</a> &amp;e) {
+<a name="l00579"></a><a class="code" href="classPassenger_1_1SpawnManager.html#aad71b2ea9431f3286f23a6e6f80e0981">00579</a>                         result = sendSpawnCommand(options);
+<a name="l00580"></a>00580                 } <span class="keywordflow">catch</span> (<span class="keyword">const</span> <a class="code" href="classPassenger_1_1SpawnException.html" title="Thrown when SpawnManager or ApplicationPool fails to spawn an application instance...">SpawnException</a> &amp;e) {
 <a name="l00581"></a>00581                         <span class="keywordflow">if</span> (e.<a class="code" href="classPassenger_1_1SpawnException.html#ae65dc272e183fd9e5637a4091cc6bbf4" title="Check whether an error page is available.">hasErrorPage</a>()) {
 <a name="l00582"></a>00582                                 <span class="keywordflow">throw</span>;
 <a name="l00583"></a>00583                         } <span class="keywordflow">else</span> {
@@ -612,18 +612,18 @@
 <a name="l00587"></a>00587                 scope.success();
 <a name="l00588"></a>00588                 <span class="keywordflow">return</span> result;
 <a name="l00589"></a>00589         }
-<a name="l00590"></a>00590         
-<a name="l00591"></a><a class="code" href="classPassenger_1_1SpawnManager.html#a9210212c23c5a8ee5ee4dd5c9dcdf57d">00591</a>         <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classPassenger_1_1SpawnManager.html#aad71b2ea9431f3286f23a6e6f80e0981" title="Shutdown the ApplicationSpawner server that&amp;#39;s running at the given application...">reload</a>(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;appRoot) {
+<a name="l00590"></a><a class="code" href="classPassenger_1_1SpawnManager.html#a9210212c23c5a8ee5ee4dd5c9dcdf57d">00590</a>         
+<a name="l00591"></a>00591         <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classPassenger_1_1SpawnManager.html#aad71b2ea9431f3286f23a6e6f80e0981" title="Shutdown the ApplicationSpawner server that&amp;#39;s running at the given application...">reload</a>(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;appRoot) {
 <a name="l00592"></a>00592                 TRACE_POINT();
 <a name="l00593"></a>00593                 this_thread::disable_interruption di;
-<a name="l00594"></a>00594                 this_thread::disable_syscall_interruption dsi;
-<a name="l00595"></a><a class="code" href="classPassenger_1_1SpawnManager.html#af34df8cfccfc64507999f1b48bc5a126">00595</a>                 <span class="keywordflow">try</span> {
+<a name="l00594"></a><a class="code" href="classPassenger_1_1SpawnManager.html#af34df8cfccfc64507999f1b48bc5a126">00594</a>                 this_thread::disable_syscall_interruption dsi;
+<a name="l00595"></a>00595                 <span class="keywordflow">try</span> {
 <a name="l00596"></a>00596                         <span class="keywordflow">return</span> sendReloadCommand(appRoot);
 <a name="l00597"></a>00597                 } <span class="keywordflow">catch</span> (<span class="keyword">const</span> <a class="code" href="classPassenger_1_1SystemException.html" title="Represents an error returned by a system call or a standard library call.">SystemException</a> &amp;e) {
 <a name="l00598"></a>00598                         <span class="keywordflow">return</span> handleReloadException(e, appRoot);
 <a name="l00599"></a>00599                 }
-<a name="l00600"></a>00600         }
-<a name="l00601"></a><a class="code" href="namespacePassenger.html#a6ab2d566ff87a2676c23d8aa40204587">00601</a>         
+<a name="l00600"></a><a class="code" href="namespacePassenger.html#a6ab2d566ff87a2676c23d8aa40204587">00600</a>         }
+<a name="l00601"></a>00601         
 <a name="l00602"></a>00602         <span class="keyword">virtual</span> <span class="keywordtype">void</span> <a class="code" href="classPassenger_1_1SpawnManager.html#a9210212c23c5a8ee5ee4dd5c9dcdf57d" title="Forcefully kill the spawn server.">killSpawnServer</a>()<span class="keyword"> const </span>{
 <a name="l00603"></a>00603                 kill(pid, SIGKILL);
 <a name="l00604"></a>00604         }