passenger 2.1.3 → 2.2.0

data/doc/rdoc/classes/PhusionPassenger/AdminTools.html

@@ -75,8 +75,8 @@
 
   <div class="sectiontitle">Methods</div>
   <ul>
-  <li><a href="#M000064">process_is_alive?</a></li>
-  <li><a href="#M000063">tmpdir</a></li>
+  <li><a href="#M000065">process_is_alive?</a></li>
+  <li><a href="#M000064">tmpdir</a></li>
   </ul>
 
 
@@ -90,44 +90,44 @@
 <div class="sectiontitle">Public Class methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000064"></a><b>process_is_alive?</b>(pid)
+    <a name="M000065"></a><b>process_is_alive?</b>(pid)
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000064_source')" id="l_M000064_source">show source</a> ]</p>
-  <div id="M000064_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000065_source')" id="l_M000065_source">show source</a> ]</p>
+  <div id="M000065_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools.rb, line 13</span>
-13:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">process_is_alive?</span>(<span class="ruby-identifier">pid</span>)
-14:                 <span class="ruby-keyword kw">begin</span>
-15:                         <span class="ruby-constant">Process</span>.<span class="ruby-identifier">kill</span>(<span class="ruby-value">0</span>, <span class="ruby-identifier">pid</span>)
-16:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
-17:                 <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">ESRCH</span>
-18:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
-19:                 <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">SystemCallError</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
-20:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
-21:                 <span class="ruby-keyword kw">end</span>
-22:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools.rb, line 36</span>
+36:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">process_is_alive?</span>(<span class="ruby-identifier">pid</span>)
+37:                 <span class="ruby-keyword kw">begin</span>
+38:                         <span class="ruby-constant">Process</span>.<span class="ruby-identifier">kill</span>(<span class="ruby-value">0</span>, <span class="ruby-identifier">pid</span>)
+39:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
+40:                 <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">Errno</span><span class="ruby-operator">::</span><span class="ruby-constant">ESRCH</span>
+41:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">false</span>
+42:                 <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">SystemCallError</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-identifier">e</span>
+43:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">true</span>
+44:                 <span class="ruby-keyword kw">end</span>
+45:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000063"></a><b>tmpdir</b>()
+    <a name="M000064"></a><b>tmpdir</b>()
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000063_source')" id="l_M000063_source">show source</a> ]</p>
-  <div id="M000063_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000064_source')" id="l_M000064_source">show source</a> ]</p>
+  <div id="M000064_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools.rb, line 4</span>
- 4:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">tmpdir</span>
- 5:                 [<span class="ruby-value str">&quot;PASSENGER_TEMP_DIR&quot;</span>, <span class="ruby-value str">&quot;PASSENGER_TMPDIR&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
- 6:                         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">ENV</span>.<span class="ruby-identifier">has_key?</span>(<span class="ruby-identifier">name</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-constant">ENV</span>[<span class="ruby-identifier">name</span>].<span class="ruby-identifier">empty?</span>
- 7:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-identifier">name</span>]
- 8:                         <span class="ruby-keyword kw">end</span>
- 9:                 <span class="ruby-keyword kw">end</span>
-10:                 <span class="ruby-keyword kw">return</span> <span class="ruby-value str">&quot;/tmp&quot;</span>
-11:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools.rb, line 27</span>
+27:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">tmpdir</span>
+28:                 [<span class="ruby-value str">&quot;PASSENGER_TEMP_DIR&quot;</span>, <span class="ruby-value str">&quot;PASSENGER_TMPDIR&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">name</span><span class="ruby-operator">|</span>
+29:                         <span class="ruby-keyword kw">if</span> <span class="ruby-constant">ENV</span>.<span class="ruby-identifier">has_key?</span>(<span class="ruby-identifier">name</span>) <span class="ruby-operator">&amp;&amp;</span> <span class="ruby-operator">!</span><span class="ruby-constant">ENV</span>[<span class="ruby-identifier">name</span>].<span class="ruby-identifier">empty?</span>
+30:                                 <span class="ruby-keyword kw">return</span> <span class="ruby-constant">ENV</span>[<span class="ruby-identifier">name</span>]
+31:                         <span class="ruby-keyword kw">end</span>
+32:                 <span class="ruby-keyword kw">end</span>
+33:                 <span class="ruby-keyword kw">return</span> <span class="ruby-value str">&quot;/tmp&quot;</span>
+34:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/PhusionPassenger/AdminTools/ControlProcess.html

@@ -80,12 +80,13 @@ Object
 
   <div class="sectiontitle">Methods</div>
   <ul>
-  <li><a href="#M000069">domains</a></li>
-  <li><a href="#M000070">instances</a></li>
-  <li><a href="#M000065">list</a></li>
-  <li><a href="#M000066">new</a></li>
-  <li><a href="#M000067">status</a></li>
-  <li><a href="#M000068">xml</a></li>
+  <li><a href="#M000071">domains</a></li>
+  <li><a href="#M000067">for_pid</a></li>
+  <li><a href="#M000072">instances</a></li>
+  <li><a href="#M000066">list</a></li>
+  <li><a href="#M000068">new</a></li>
+  <li><a href="#M000069">status</a></li>
+  <li><a href="#M000070">xml</a></li>
   </ul>
 
 
@@ -116,56 +117,71 @@ Object
 <div class="sectiontitle">Public Class methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000065"></a><b>list</b>(clean_stale = true)
+    <a name="M000067"></a><b>for_pid</b>(pid)
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000065_source')" id="l_M000065_source">show source</a> ]</p>
-  <div id="M000065_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000067_source')" id="l_M000067_source">show source</a> ]</p>
+  <div id="M000067_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 18</span>
-18:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">list</span>(<span class="ruby-identifier">clean_stale</span> = <span class="ruby-keyword kw">true</span>)
-19:                 <span class="ruby-identifier">results</span> = []
-20:                 <span class="ruby-constant">Dir</span>[<span class="ruby-node">&quot;#{AdminTools.tmpdir}/passenger.*&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">dir</span><span class="ruby-operator">|</span>
-21:                         <span class="ruby-identifier">dir</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/passenger.(\d+)\Z/</span>
-22:                         <span class="ruby-keyword kw">next</span> <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-identifier">$1</span>
-23:                         <span class="ruby-identifier">pid</span> = <span class="ruby-identifier">$1</span>.<span class="ruby-identifier">to_i</span>
-24:                         <span class="ruby-keyword kw">begin</span>
-25:                                 <span class="ruby-identifier">results</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">ControlProcess</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">pid</span>, <span class="ruby-identifier">dir</span>)
-26:                         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ArgumentError</span>
-27:                                 <span class="ruby-comment cmt"># Stale Passenger temp folder. Clean it up if instructed.</span>
-28:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">clean_stale</span>
-29:                                         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;*** Cleaning stale folder #{dir}&quot;</span>
-30:                                         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">chmod_R</span>(<span class="ruby-value">0700</span>, <span class="ruby-identifier">dir</span>) <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-identifier">dir</span>)
-31:                                         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm_rf</span>(<span class="ruby-identifier">dir</span>)
-32:                                 <span class="ruby-keyword kw">end</span>
-33:                         <span class="ruby-keyword kw">end</span>
-34:                 <span class="ruby-keyword kw">end</span>
-35:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">results</span>
-36:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 59</span>
+59:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">for_pid</span>(<span class="ruby-identifier">pid</span>)
+60:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">list</span>(<span class="ruby-keyword kw">false</span>).<span class="ruby-identifier">find</span> { <span class="ruby-operator">|</span><span class="ruby-identifier">c</span><span class="ruby-operator">|</span> <span class="ruby-identifier">c</span>.<span class="ruby-identifier">pid</span> <span class="ruby-operator">==</span> <span class="ruby-identifier">pid</span> }
+61:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000066"></a><b>new</b>(pid, path = nil)
+    <a name="M000066"></a><b>list</b>(clean_stale = true)
   </div>
 <div class="sourcecode">
   <p class="source-link">[ <a href="javascript:toggleSource('M000066_source')" id="l_M000066_source">show source</a> ]</p>
   <div id="M000066_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 38</span>
-38:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">pid</span>, <span class="ruby-identifier">path</span> = <span class="ruby-keyword kw">nil</span>)
-39:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-constant">AdminTools</span>.<span class="ruby-identifier">process_is_alive?</span>(<span class="ruby-identifier">pid</span>)
-40:                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-node">&quot;There is no control process with PID #{pid}.&quot;</span>
-41:                 <span class="ruby-keyword kw">end</span>
-42:                 <span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">pid</span>
-43:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">path</span>
-44:                         <span class="ruby-ivar">@path</span> = <span class="ruby-identifier">path</span>
-45:                 <span class="ruby-keyword kw">else</span>
-46:                         <span class="ruby-ivar">@path</span> = <span class="ruby-node">&quot;#{AdminTools.tmpdir}/passenger.#{pid}&quot;</span>
-47:                 <span class="ruby-keyword kw">end</span>
-48:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 41</span>
+41:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">list</span>(<span class="ruby-identifier">clean_stale</span> = <span class="ruby-keyword kw">true</span>)
+42:                 <span class="ruby-identifier">results</span> = []
+43:                 <span class="ruby-constant">Dir</span>[<span class="ruby-node">&quot;#{AdminTools.tmpdir}/passenger.*&quot;</span>].<span class="ruby-identifier">each</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">dir</span><span class="ruby-operator">|</span>
+44:                         <span class="ruby-keyword kw">next</span> <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">dir</span> <span class="ruby-operator">!~</span> <span class="ruby-regexp re">/passenger.(\d+)\Z/</span>
+45:                         <span class="ruby-keyword kw">begin</span>
+46:                                 <span class="ruby-identifier">results</span> <span class="ruby-operator">&lt;&lt;</span> <span class="ruby-constant">ControlProcess</span>.<span class="ruby-identifier">new</span>(<span class="ruby-identifier">dir</span>)
+47:                         <span class="ruby-keyword kw">rescue</span> <span class="ruby-constant">ArgumentError</span>
+48:                                 <span class="ruby-comment cmt"># Stale Passenger temp folder. Clean it up if instructed.</span>
+49:                                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">clean_stale</span>
+50:                                         <span class="ruby-identifier">puts</span> <span class="ruby-node">&quot;*** Cleaning stale folder #{dir}&quot;</span>
+51:                                         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">chmod_R</span>(<span class="ruby-value">0700</span>, <span class="ruby-identifier">dir</span>) <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
+52:                                         <span class="ruby-constant">FileUtils</span>.<span class="ruby-identifier">rm_rf</span>(<span class="ruby-identifier">dir</span>)
+53:                                 <span class="ruby-keyword kw">end</span>
+54:                         <span class="ruby-keyword kw">end</span>
+55:                 <span class="ruby-keyword kw">end</span>
+56:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">results</span>
+57:         <span class="ruby-keyword kw">end</span>
+</pre>
+  </div>
+</div>
+</div>
+<div class="method">
+  <div class="title">
+    <a name="M000068"></a><b>new</b>(path)
+  </div>
+<div class="sourcecode">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000068_source')" id="l_M000068_source">show source</a> ]</p>
+  <div id="M000068_source" class="dyn-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 63</span>
+63:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">path</span>)
+64:                 <span class="ruby-ivar">@path</span> = <span class="ruby-identifier">path</span>
+65:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">exist?</span>(<span class="ruby-node">&quot;#{path}/control_process.pid&quot;</span>)
+66:                         <span class="ruby-ivar">@pid</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">read</span>(<span class="ruby-node">&quot;#{path}/control_process.pid&quot;</span>).<span class="ruby-identifier">strip</span>.<span class="ruby-identifier">to_i</span>
+67:                 <span class="ruby-keyword kw">else</span>
+68:                         <span class="ruby-identifier">path</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/passenger.(\d+)\Z/</span>
+69:                         <span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">$1</span>.<span class="ruby-identifier">to_i</span>
+70:                 <span class="ruby-keyword kw">end</span>
+71:                 <span class="ruby-keyword kw">if</span> <span class="ruby-operator">!</span><span class="ruby-constant">AdminTools</span>.<span class="ruby-identifier">process_is_alive?</span>(<span class="ruby-ivar">@pid</span>)
+72:                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">ArgumentError</span>, <span class="ruby-node">&quot;There is no control process with PID #{@pid}.&quot;</span>
+73:                 <span class="ruby-keyword kw">end</span>
+74:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -173,69 +189,69 @@ Object
 <div class="sectiontitle">Public Instance methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000069"></a><b>domains</b>()
+    <a name="M000071"></a><b>domains</b>()
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000069_source')" id="l_M000069_source">show source</a> ]</p>
-  <div id="M000069_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000071_source')" id="l_M000071_source">show source</a> ]</p>
+  <div id="M000071_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 60</span>
-60:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">domains</span>
-61:                 <span class="ruby-identifier">reload</span>
-62:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@domains</span>
-63:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 86</span>
+86:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">domains</span>
+87:                 <span class="ruby-identifier">reload</span>
+88:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@domains</span>
+89:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000070"></a><b>instances</b>()
+    <a name="M000072"></a><b>instances</b>()
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000070_source')" id="l_M000070_source">show source</a> ]</p>
-  <div id="M000070_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000072_source')" id="l_M000072_source">show source</a> ]</p>
+  <div id="M000072_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 65</span>
-65:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">instances</span>
-66:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">domains</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">domain</span><span class="ruby-operator">|</span>
-67:                         <span class="ruby-identifier">domain</span>[<span class="ruby-identifier">:instances</span>]
-68:                 <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">flatten</span>
-69:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 91</span>
+91:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">instances</span>
+92:                 <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">domains</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">domain</span><span class="ruby-operator">|</span>
+93:                         <span class="ruby-identifier">domain</span>[<span class="ruby-identifier">:instances</span>]
+94:                 <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">flatten</span>
+95:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000067"></a><b>status</b>()
+    <a name="M000069"></a><b>status</b>()
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000067_source')" id="l_M000067_source">show source</a> ]</p>
-  <div id="M000067_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000069_source')" id="l_M000069_source">show source</a> ]</p>
+  <div id="M000069_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 50</span>
-50:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>
-51:                 <span class="ruby-identifier">reload</span>
-52:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@status</span>
-53:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 76</span>
+76:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">status</span>
+77:                 <span class="ruby-identifier">reload</span>
+78:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@status</span>
+79:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000068"></a><b>xml</b>()
+    <a name="M000070"></a><b>xml</b>()
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000068_source')" id="l_M000068_source">show source</a> ]</p>
-  <div id="M000068_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000070_source')" id="l_M000070_source">show source</a> ]</p>
+  <div id="M000070_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 55</span>
-55:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">xml</span>
-56:                 <span class="ruby-identifier">reload</span>
-57:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@xml</span>
-58:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/admin_tools/control_process.rb, line 81</span>
+81:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">xml</span>
+82:                 <span class="ruby-identifier">reload</span>
+83:                 <span class="ruby-keyword kw">return</span> <span class="ruby-ivar">@xml</span>
+84:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/PhusionPassenger/AppInitError.html

@@ -96,7 +96,7 @@ instance of <tt>SystemExit</tt>.
 
   <div class="sectiontitle">Methods</div>
   <ul>
-  <li><a href="#M000089">new</a></li>
+  <li><a href="#M000091">new</a></li>
   </ul>
 
 
@@ -130,18 +130,18 @@ Any messages printed to stderr before the failure. May be nil.
 <div class="sectiontitle">Public Class methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000089"></a><b>new</b>(message, child_exception = nil, app_type = &quot;rails&quot;, stderr = nil)
+    <a name="M000091"></a><b>new</b>(message, child_exception = nil, app_type = &quot;rails&quot;, stderr = nil)
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000089_source')" id="l_M000089_source">show source</a> ]</p>
-  <div id="M000089_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000091_source')" id="l_M000091_source">show source</a> ]</p>
+  <div id="M000091_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/exceptions.rb, line 61</span>
-61:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">message</span>, <span class="ruby-identifier">child_exception</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">app_type</span> = <span class="ruby-value str">&quot;rails&quot;</span>, <span class="ruby-identifier">stderr</span> = <span class="ruby-keyword kw">nil</span>)
-62:                 <span class="ruby-keyword kw">super</span>(<span class="ruby-identifier">message</span>, <span class="ruby-identifier">child_exception</span>)
-63:                 <span class="ruby-ivar">@app_type</span> = <span class="ruby-identifier">app_type</span>
-64:                 <span class="ruby-ivar">@stderr</span> = <span class="ruby-identifier">stderr</span>
-65:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/exceptions.rb, line 66</span>
+66:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">message</span>, <span class="ruby-identifier">child_exception</span> = <span class="ruby-keyword kw">nil</span>, <span class="ruby-identifier">app_type</span> = <span class="ruby-value str">&quot;rails&quot;</span>, <span class="ruby-identifier">stderr</span> = <span class="ruby-keyword kw">nil</span>)
+67:                 <span class="ruby-keyword kw">super</span>(<span class="ruby-identifier">message</span>, <span class="ruby-identifier">child_exception</span>)
+68:                 <span class="ruby-ivar">@app_type</span> = <span class="ruby-identifier">app_type</span>
+69:                 <span class="ruby-ivar">@stderr</span> = <span class="ruby-identifier">stderr</span>
+70:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>

data/doc/rdoc/classes/PhusionPassenger/Application.html

@@ -84,9 +84,9 @@ Represents a single application instance.
 
   <div class="sectiontitle">Methods</div>
   <ul>
-  <li><a href="#M000109">close</a></li>
-  <li><a href="#M000107">detect_framework_version</a></li>
-  <li><a href="#M000108">new</a></li>
+  <li><a href="#M000111">close</a></li>
+  <li><a href="#M000109">detect_framework_version</a></li>
+  <li><a href="#M000110">new</a></li>
   </ul>
 
 
@@ -113,7 +113,7 @@ The root directory of this application, i.e. the directory that contains
     <td class='attr-name'>listen_socket_name</td>
     <td class='attr-desc'>
 The name of the socket on which the application instance will accept <a
-href="Application.html#M000108">new</a> connections. See
+href="Application.html#M000110">new</a> connections. See
 #listen_socket_type on how one should interpret this value.
 
 </td>
@@ -156,7 +156,7 @@ The process ID of this application instance.
 <div class="sectiontitle">Public Class methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000107"></a><b>detect_framework_version</b>(app_root)
+    <a name="M000109"></a><b>detect_framework_version</b>(app_root)
   </div>
   <div class="description">
   <ul>
@@ -176,74 +176,74 @@ Rails version is not installed.
 </p>
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000107_source')" id="l_M000107_source">show source</a> ]</p>
-  <div id="M000107_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p>
+  <div id="M000109_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 50</span>
-50:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">detect_framework_version</span>(<span class="ruby-identifier">app_root</span>)
-51:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>(<span class="ruby-node">&quot;#{app_root}/vendor/rails/railties&quot;</span>)
-52:                         <span class="ruby-comment cmt"># NOTE: We must check for 'rails/railties' and not just 'rails'.</span>
-53:                         <span class="ruby-comment cmt"># Typo's vendor directory contains an empty 'rails' directory.</span>
-54:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:vendor</span>
-55:                 <span class="ruby-keyword kw">end</span>
-56:                 
-57:                 <span class="ruby-identifier">environment_rb</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">read</span>(<span class="ruby-node">&quot;#{app_root}/config/environment.rb&quot;</span>)
-58:                 <span class="ruby-identifier">environment_rb</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^[^#]*RAILS_GEM_VERSION\s*=\s*[&quot;']([!~&lt;&gt;=]*\s*[\d.]+)[&quot;']/</span>
-59:                 <span class="ruby-identifier">gem_version_spec</span> = <span class="ruby-identifier">$1</span>
-60:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">gem_version_spec</span>.<span class="ruby-identifier">nil?</span>
-61:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
-62:                 <span class="ruby-keyword kw">end</span>
-63:                 
-64:                 <span class="ruby-identifier">search_results</span> = <span class="ruby-constant">Gem</span>.<span class="ruby-identifier">cache</span>.<span class="ruby-identifier">search</span>(<span class="ruby-constant">Gem</span><span class="ruby-operator">::</span><span class="ruby-constant">Dependency</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'rails'</span>, <span class="ruby-identifier">gem_version_spec</span>), <span class="ruby-keyword kw">true</span>)
-65:                 <span class="ruby-identifier">found_version</span> = <span class="ruby-identifier">search_results</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span>
-66:                         <span class="ruby-identifier">x</span>.<span class="ruby-identifier">version</span>.<span class="ruby-identifier">version</span>
-67:                 <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">last</span>
-68:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">found_version</span>.<span class="ruby-identifier">nil?</span>
-69:                         <span class="ruby-comment cmt"># If this error was reported before, then the cache might be out of</span>
-70:                         <span class="ruby-comment cmt"># date because the Rails version may have been installed now.</span>
-71:                         <span class="ruby-comment cmt"># So we reload the RubyGems cache and try again.</span>
-72:                         <span class="ruby-constant">Gem</span>.<span class="ruby-identifier">clear_paths</span>
-73:                         <span class="ruby-identifier">search_results</span> = <span class="ruby-constant">Gem</span>.<span class="ruby-identifier">cache</span>.<span class="ruby-identifier">search</span>(<span class="ruby-constant">Gem</span><span class="ruby-operator">::</span><span class="ruby-constant">Dependency</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'rails'</span>, <span class="ruby-identifier">gem_version_spec</span>), <span class="ruby-keyword kw">true</span>)
-74:                         <span class="ruby-identifier">found_version</span> = <span class="ruby-identifier">search_results</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span>
-75:                                 <span class="ruby-identifier">x</span>.<span class="ruby-identifier">version</span>.<span class="ruby-identifier">version</span>
-76:                         <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">last</span>
-77:                 <span class="ruby-keyword kw">end</span>
-78:                 
-79:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">found_version</span>.<span class="ruby-identifier">nil?</span>
-80:                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">VersionNotFound</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;There is no Ruby on Rails version &quot;</span> <span class="ruby-operator">&lt;&lt;</span>
-81:                                 <span class="ruby-node">&quot;installed that matches version \&quot;#{gem_version_spec}\&quot;&quot;</span>,
-82:                                 <span class="ruby-identifier">gem_version_spec</span>)
-83:                 <span class="ruby-keyword kw">else</span>
-84:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">found_version</span>
-85:                 <span class="ruby-keyword kw">end</span>
-86:         <span class="ruby-keyword kw">end</span>
+    <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 55</span>
+55:         <span class="ruby-keyword kw">def</span> <span class="ruby-keyword kw">self</span>.<span class="ruby-identifier">detect_framework_version</span>(<span class="ruby-identifier">app_root</span>)
+56:                 <span class="ruby-keyword kw">if</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">directory?</span>(<span class="ruby-node">&quot;#{app_root}/vendor/rails/railties&quot;</span>)
+57:                         <span class="ruby-comment cmt"># NOTE: We must check for 'rails/railties' and not just 'rails'.</span>
+58:                         <span class="ruby-comment cmt"># Typo's vendor directory contains an empty 'rails' directory.</span>
+59:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">:vendor</span>
+60:                 <span class="ruby-keyword kw">end</span>
+61:                 
+62:                 <span class="ruby-identifier">environment_rb</span> = <span class="ruby-constant">File</span>.<span class="ruby-identifier">read</span>(<span class="ruby-node">&quot;#{app_root}/config/environment.rb&quot;</span>)
+63:                 <span class="ruby-identifier">environment_rb</span> <span class="ruby-operator">=~</span> <span class="ruby-regexp re">/^[^#]*RAILS_GEM_VERSION\s*=\s*[&quot;']([!~&lt;&gt;=]*\s*[\d.]+)[&quot;']/</span>
+64:                 <span class="ruby-identifier">gem_version_spec</span> = <span class="ruby-identifier">$1</span>
+65:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">gem_version_spec</span>.<span class="ruby-identifier">nil?</span>
+66:                         <span class="ruby-keyword kw">return</span> <span class="ruby-keyword kw">nil</span>
+67:                 <span class="ruby-keyword kw">end</span>
+68:                 
+69:                 <span class="ruby-identifier">search_results</span> = <span class="ruby-constant">Gem</span>.<span class="ruby-identifier">cache</span>.<span class="ruby-identifier">search</span>(<span class="ruby-constant">Gem</span><span class="ruby-operator">::</span><span class="ruby-constant">Dependency</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'rails'</span>, <span class="ruby-identifier">gem_version_spec</span>), <span class="ruby-keyword kw">true</span>)
+70:                 <span class="ruby-identifier">found_version</span> = <span class="ruby-identifier">search_results</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span>
+71:                         <span class="ruby-identifier">x</span>.<span class="ruby-identifier">version</span>.<span class="ruby-identifier">version</span>
+72:                 <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">last</span>
+73:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">found_version</span>.<span class="ruby-identifier">nil?</span>
+74:                         <span class="ruby-comment cmt"># If this error was reported before, then the cache might be out of</span>
+75:                         <span class="ruby-comment cmt"># date because the Rails version may have been installed now.</span>
+76:                         <span class="ruby-comment cmt"># So we reload the RubyGems cache and try again.</span>
+77:                         <span class="ruby-constant">Gem</span>.<span class="ruby-identifier">clear_paths</span>
+78:                         <span class="ruby-identifier">search_results</span> = <span class="ruby-constant">Gem</span>.<span class="ruby-identifier">cache</span>.<span class="ruby-identifier">search</span>(<span class="ruby-constant">Gem</span><span class="ruby-operator">::</span><span class="ruby-constant">Dependency</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">'rails'</span>, <span class="ruby-identifier">gem_version_spec</span>), <span class="ruby-keyword kw">true</span>)
+79:                         <span class="ruby-identifier">found_version</span> = <span class="ruby-identifier">search_results</span>.<span class="ruby-identifier">map</span> <span class="ruby-keyword kw">do</span> <span class="ruby-operator">|</span><span class="ruby-identifier">x</span><span class="ruby-operator">|</span>
+80:                                 <span class="ruby-identifier">x</span>.<span class="ruby-identifier">version</span>.<span class="ruby-identifier">version</span>
+81:                         <span class="ruby-keyword kw">end</span>.<span class="ruby-identifier">sort</span>.<span class="ruby-identifier">last</span>
+82:                 <span class="ruby-keyword kw">end</span>
+83:                 
+84:                 <span class="ruby-keyword kw">if</span> <span class="ruby-identifier">found_version</span>.<span class="ruby-identifier">nil?</span>
+85:                         <span class="ruby-identifier">raise</span> <span class="ruby-constant">VersionNotFound</span>.<span class="ruby-identifier">new</span>(<span class="ruby-value str">&quot;There is no Ruby on Rails version &quot;</span> <span class="ruby-operator">&lt;&lt;</span>
+86:                                 <span class="ruby-node">&quot;installed that matches version \&quot;#{gem_version_spec}\&quot;&quot;</span>,
+87:                                 <span class="ruby-identifier">gem_version_spec</span>)
+88:                 <span class="ruby-keyword kw">else</span>
+89:                         <span class="ruby-keyword kw">return</span> <span class="ruby-identifier">found_version</span>
+90:                 <span class="ruby-keyword kw">end</span>
+91:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
 </div>
 <div class="method">
   <div class="title">
-    <a name="M000108"></a><b>new</b>(app_root, pid, listen_socket_name, listen_socket_type, owner_pipe)
+    <a name="M000110"></a><b>new</b>(app_root, pid, listen_socket_name, listen_socket_type, owner_pipe)
   </div>
   <div class="description">
   <p>
-Creates a <a href="Application.html#M000108">new</a> instance of <a
+Creates a <a href="Application.html#M000110">new</a> instance of <a
 href="Application.html">Application</a>. The parameters correspond with the
 attributes of the same names. No exceptions will be thrown.
 </p>
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000108_source')" id="l_M000108_source">show source</a> ]</p>
-  <div id="M000108_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000110_source')" id="l_M000110_source">show source</a> ]</p>
+  <div id="M000110_source" class="dyn-source">
 <pre>
-    <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 90</span>
-90:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">app_root</span>, <span class="ruby-identifier">pid</span>, <span class="ruby-identifier">listen_socket_name</span>, <span class="ruby-identifier">listen_socket_type</span>, <span class="ruby-identifier">owner_pipe</span>)
-91:                 <span class="ruby-ivar">@app_root</span> = <span class="ruby-identifier">app_root</span>
-92:                 <span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">pid</span>
-93:                 <span class="ruby-ivar">@listen_socket_name</span> = <span class="ruby-identifier">listen_socket_name</span>
-94:                 <span class="ruby-ivar">@listen_socket_type</span> = <span class="ruby-identifier">listen_socket_type</span>
-95:                 <span class="ruby-ivar">@owner_pipe</span> = <span class="ruby-identifier">owner_pipe</span>
-96:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 95</span>
+ 95:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">initialize</span>(<span class="ruby-identifier">app_root</span>, <span class="ruby-identifier">pid</span>, <span class="ruby-identifier">listen_socket_name</span>, <span class="ruby-identifier">listen_socket_type</span>, <span class="ruby-identifier">owner_pipe</span>)
+ 96:                 <span class="ruby-ivar">@app_root</span> = <span class="ruby-identifier">app_root</span>
+ 97:                 <span class="ruby-ivar">@pid</span> = <span class="ruby-identifier">pid</span>
+ 98:                 <span class="ruby-ivar">@listen_socket_name</span> = <span class="ruby-identifier">listen_socket_name</span>
+ 99:                 <span class="ruby-ivar">@listen_socket_type</span> = <span class="ruby-identifier">listen_socket_type</span>
+100:                 <span class="ruby-ivar">@owner_pipe</span> = <span class="ruby-identifier">owner_pipe</span>
+101:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>
@@ -251,7 +251,7 @@ attributes of the same names. No exceptions will be thrown.
 <div class="sectiontitle">Public Instance methods</div>
 <div class="method">
   <div class="title">
-    <a name="M000109"></a><b>close</b>()
+    <a name="M000111"></a><b>close</b>()
   </div>
   <div class="description">
   <p>
@@ -264,13 +264,13 @@ See also AbstractRequestHandler#owner_pipe.
 </p>
   </div>
 <div class="sourcecode">
-  <p class="source-link">[ <a href="javascript:toggleSource('M000109_source')" id="l_M000109_source">show source</a> ]</p>
-  <div id="M000109_source" class="dyn-source">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000111_source')" id="l_M000111_source">show source</a> ]</p>
+  <div id="M000111_source" class="dyn-source">
 <pre>
-     <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 103</span>
-103:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
-104:                 <span class="ruby-ivar">@owner_pipe</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
-105:         <span class="ruby-keyword kw">end</span>
+     <span class="ruby-comment cmt"># File lib/phusion_passenger/application.rb, line 108</span>
+108:         <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">close</span>
+109:                 <span class="ruby-ivar">@owner_pipe</span>.<span class="ruby-identifier">close</span> <span class="ruby-keyword kw">rescue</span> <span class="ruby-keyword kw">nil</span>
+110:         <span class="ruby-keyword kw">end</span>
 </pre>
   </div>
 </div>