passenger 3.0.2 → 3.0.3

data/NEWS

@@ -1,3 +1,32 @@
+Release 3.0.3
+-------------
+
+ * [Nginx] Preferred Nginx version upgraded to 0.8.54
+   The previous preferred version was 0.8.53.
+ * PATH_INFO and REQUEST_URI now contain the original escaped URI
+   Phusion Passenger passes the URI, as reported by Apache/Nginx, to
+   application processes through the PATH_INFO and REQUEST_URI variables.
+   These variables are supposed to contain the original, unescaped URI, e.g.
+   /clubs/%C3%BC. Both Apache and Nginx thought that it would be a good idea
+   to unescape the URI before passing it to modules like Phusion Passenger,
+   thereby causing PATH_INFO and REQUEST_URI to contain the unescaped URI,
+   e.g. /clubs/ü. This causes all sorts of encoding problems. We now manually
+   re-escape the URI when setting PATH_INFO and REQUEST_URI. Issue #404.
+ * The installer no longer detects directories as potential commands
+   Previously the installer would look in $PATH for everything that's
+   executable, including directories. If one has /usr/lib in $PATH
+   and a directory /usr/lib/gcc exists then the installer would recognize
+   /usr/lib/gcc as the compiler. We now explicitly check whether the item
+   is also a file.
+ * PseudoIO now responds to #to_io
+   Phusion Passenger sets STDERR to a PseudoIO object in order to capture
+   anything written to STDERR during application startup. This breaks
+   some libraries which expect STDERR to respond to #to_io. This has now
+   been fixed. Issue #607.
+ * Fixed various other minor bugs
+   See the git commit log for details.
+
+
 Release 3.0.2
 -------------
 

data/build/agents.rb

@@ -47,6 +47,7 @@ dependencies = [
 	'ext/common/LoggingAgent/RemoteSender.h',
 	'ext/common/LoggingAgent/ChangeNotifier.h',
 	'ext/common/LoggingAgent/DataStoreId.h',
+	'ext/common/LoggingAgent/FilterSupport.h',
 	'ext/common/ServerInstanceDir.h',
 	'ext/common/Logging.h',
 	'ext/common/EventedServer.h',

data/build/apache2.rb

@@ -35,7 +35,8 @@ APACHE2_MODULE_INPUT_FILES = {
 		ext/apache2/Configuration.cpp
 		ext/apache2/Configuration.h
 		ext/apache2/Configuration.hpp
-		ext/common/Constants.h),
+		ext/common/Constants.h
+		ext/common/LoggingAgent/FilterSupport.h),
 	APACHE2_OUTPUT_DIR + 'Bucket.o' => %w(
 		ext/apache2/Bucket.cpp
 		ext/apache2/Bucket.h),

data/build/cxx_tests.rb

@@ -134,6 +134,7 @@ TEST_CXX_OBJECTS = {
 		ext/common/LoggingAgent/RemoteSender.h
 		ext/common/LoggingAgent/ChangeNotifier.h
 		ext/common/LoggingAgent/DataStoreId.h
+		ext/common/LoggingAgent/FilterSupport.h
 		ext/common/Logging.h
 		ext/common/Utils.h
 		ext/common/EventedServer.h
@@ -172,6 +173,9 @@ TEST_CXX_OBJECTS = {
 		test/cxx/SystemTimeTest.cpp
 		ext/common/Utils/SystemTime.h
 		ext/common/Utils/SystemTime.cpp),
+	'test/cxx/FilterSupportTest.o' => %w(
+		test/cxx/FilterSupportTest.cpp
+		ext/common/LoggingAgent/FilterSupport.h),
 	'test/cxx/CachedFileStatTest.o' => %w(
 		test/cxx/CachedFileStatTest.cpp
 		ext/common/Utils/CachedFileStat.hpp
@@ -184,6 +188,9 @@ TEST_CXX_OBJECTS = {
 		test/cxx/VariantMapTest.cpp
 		ext/common/MessageChannel.h
 		ext/common/Utils/VariantMap.h),
+	'test/cxx/StringMapTest.o' => %w(
+		test/cxx/StringMapTest.cpp
+		ext/common/Utils/StringMap.h),
 	'test/cxx/ProcessMetricsCollectorTest.o' => %w(
 		test/cxx/ProcessMetricsCollectorTest.cpp
 		ext/common/Utils/ProcessMetricsCollector.h),

data/build/rpm.rb

@@ -31,17 +31,8 @@ namespace :package do
 		system(*args)
 	end
 
-	def create_tarball(verbosity = 0)
-		working_dir = "/tmp/#{`whoami`.strip}-passenger-rpm-#{Process.pid}"
-		sub_dir = "passenger-#{PhusionPassenger::VERSION_STRING}"
-		FileUtils.rm_rf(working_dir, :verbose => verbosity > 0)
-		begin
-			FileUtils.mkdir_p("#{working_dir}/#{sub_dir}", :verbose => verbosity > 0)
-			noisy_system(*(%w{rsync -ra --exclude=.git --exclude=rpm/pkg --exclude=rpm/yum-repo --exclude=*.o --exclude=*.so} + (@verbosity > 2 ? %w{-v} : []) + (@verbosity > 3 ? %w{--progress} : []) + ['.', "#{working_dir}/#{sub_dir}/."] ))
-			noisy_system('tar', "cz#{verbosity >= 2 ? 'v' : ''}", "-C", working_dir, '-f', "#{sources_dir}/#{sub_dir}.tar.gz", sub_dir)
-		ensure
-			FileUtils.rm_rf("#{working_dir}", :verbose => verbosity > 0)
-		end
+	def copy_tarball(verbosity = 0)
+		FileUtils.cp(File.join('pkg', "passenger-#{PhusionPassenger::VERSION_STRING}.tar.gz"), sources_dir, :verbose => verbosity > 0)
 	end
 
 	def test_setup(*args)
@@ -55,6 +46,8 @@ namespace :package do
 			end
 		end
 
+		ENV['BUILD_VERBOSITY'] = @verbosity.to_s
+
 		result = noisy_system('./rpm/release/mocksetup-first.sh', *args)
 		if !result
 			# exit status 4 means that the user needs to relogin.
@@ -68,22 +61,24 @@ namespace :package do
 	end
 
 	desc "Package the current release into a set of RPMs"
-	task 'rpm' => :rpm_verbosity do
+	task 'rpm' => [:package, :rpm_verbosity] do
 		test_setup
-		create_tarball(@verbosity)
-		# Add a single -v for some feedback
-		noisy_system(*(%w{./rpm/release/build.rb --single --stage-dir=pkg --extra-packages=release/mock-repo} + @build_verbosity))
+		copy_tarball(@verbosity)
+		noisy_system(*(%w{./rpm/release/build.rb --single} + ["--stage-dir=#{ENV['stage_dir'] || 'pkg'}", "--extra-packages=#{ENV['extra_packages'] || 'release/mock-repo'}"] + @build_verbosity))
 	end
 
 	desc "Build a Yum repository for the current release"
-	task 'yum' => :rpm_verbosity do
+	task 'yum' => [:package, :rpm_verbosity] do
 		test_setup(*%w{-p createrepo -p rubygem-gem2rpm})
-		create_tarball(@verbosity)
-		# Add a single -v for some feedback
-		noisy_system(*(%w{./rpm/release/build.rb --stage-dir=yum-repo --extra-packages=release/mock-repo} + @build_verbosity))
-		Dir["yum-repo/{fedora,rhel}/*/{i386,x86_64}"].each do |dir|
+		copy_tarball(@verbosity)
+		noisy_system(*(%w{./rpm/release/build.rb --include-release} + ["--stage-dir=#{ENV['stage_dir'] || 'yum-repo'}", "--extra-packages=#{ENV['extra_packages'] || 'release/mock-repo'}"] + @build_verbosity))
+		repo=File.expand_path("#{ENV['stage_dir'] || 'yum-repo'}", 'rpm')
+		Dir["#{repo}/{fedora,rhel}/*/{i386,x86_64}"].each do |dir|
 			noisy_system('createrepo', dir)
 		end
+		FileUtils.cp(Dir["rpm/doc/*.shtml"], repo, :verbose => @verbosity > 0)
+		FileUtils.cp('rpm/doc/example_yum_repository_htaccess', "#{repo}/.htaccess.example", :verbose => @verbosity > 0)
+		FileUtils.cp('rpm/release/RPM-GPG-KEY-stealthymonkeys', "#{repo}/RPM-GPG-KEY-stealthymonkeys.asc")
 	end
 
 	task 'rpm_verbosity' do
@@ -91,8 +86,8 @@ namespace :package do
 			@verbosity = 1
 			@build_verbosity = %w{-v}
 		else
-			@verbosity = ENV['verbosity'].to_i
-			@build_verbosity = %w{-v} * (@verbosity == 0 ? 1 : @verbosity)
+			@verbosity = ENV['verbosity'] ? ENV['verbosity'].to_i : 1
+			@build_verbosity = %w{-v} * @verbosity
 		end
 	end
 end

data/doc/cxxapi/Constants_8h_source.html

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

data/doc/cxxapi/Exceptions_8h_source.html

@@ -367,10 +367,24 @@
 <a name="l00342"></a>00342         <span class="keyword">virtual</span> ~<a class="code" href="classPassenger_1_1BusyException.html" title="The application pool is too busy and cannot fulfill a get() request.">BusyException</a>() <span class="keywordflow">throw</span>() {}
 <a name="l00343"></a>00343         <span class="keyword">virtual</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *what() <span class="keyword">const</span> <span class="keywordflow">throw</span>() { <span class="keywordflow">return</span> msg.c_str(); }
 <a name="l00344"></a>00344 };
-<a name="l00345"></a>00345 
-<a name="l00346"></a>00346 } <span class="comment">// namespace Passenger</span>
-<a name="l00347"></a>00347 
-<a name="l00348"></a>00348 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_EXCEPTIONS_H_ */</span>
+<a name="l00345"></a>00345 <span class="comment"></span>
+<a name="l00346"></a>00346 <span class="comment">/**</span>
+<a name="l00347"></a>00347 <span class="comment"> * A parser detected a syntax error.</span>
+<a name="l00348"></a>00348 <span class="comment"> *</span>
+<a name="l00349"></a>00349 <span class="comment"> * @ingroup Exceptions</span>
+<a name="l00350"></a>00350 <span class="comment"> */</span>
+<a name="l00351"></a><a class="code" href="classPassenger_1_1SyntaxError.html">00351</a> <span class="keyword">class </span><a class="code" href="classPassenger_1_1SyntaxError.html" title="A parser detected a syntax error.">SyntaxError</a>: <span class="keyword">public</span> oxt::tracable_exception {
+<a name="l00352"></a>00352 <span class="keyword">private</span>:
+<a name="l00353"></a>00353         <span class="keywordtype">string</span> msg;
+<a name="l00354"></a>00354 <span class="keyword">public</span>:
+<a name="l00355"></a>00355         <a class="code" href="classPassenger_1_1SyntaxError.html" title="A parser detected a syntax error.">SyntaxError</a>(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;message): msg(message) {}
+<a name="l00356"></a>00356         <span class="keyword">virtual</span> ~<a class="code" href="classPassenger_1_1SyntaxError.html" title="A parser detected a syntax error.">SyntaxError</a>() <span class="keywordflow">throw</span>() {}
+<a name="l00357"></a>00357         <span class="keyword">virtual</span> <span class="keyword">const</span> <span class="keywordtype">char</span> *what() <span class="keyword">const</span> <span class="keywordflow">throw</span>() { <span class="keywordflow">return</span> msg.c_str(); }
+<a name="l00358"></a>00358 };
+<a name="l00359"></a>00359 
+<a name="l00360"></a>00360 } <span class="comment">// namespace Passenger</span>
+<a name="l00361"></a>00361 
+<a name="l00362"></a>00362 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_EXCEPTIONS_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/Logging_8h_source.html

@@ -454,270 +454,340 @@
 <a name="l00429"></a>00429 };
 <a name="l00430"></a>00430 
 <a name="l00431"></a>00431 <span class="keyword">class </span>AnalyticsLogger {
-<a name="l00432"></a>00432 <span class="keyword">private</span>:
-<a name="l00433"></a>00433         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> RETRY_SLEEP = 200000; <span class="comment">// microseconds</span>
-<a name="l00434"></a>00434         
-<a name="l00435"></a>00435         <span class="keywordtype">string</span> serverAddress;
-<a name="l00436"></a>00436         <span class="keywordtype">string</span> username;
-<a name="l00437"></a>00437         <span class="keywordtype">string</span> password;
-<a name="l00438"></a>00438         <span class="keywordtype">string</span> nodeName;
-<a name="l00439"></a>00439         RandomGenerator randomGenerator;
-<a name="l00440"></a>00440         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> maxConnectTries;
-<a name="l00441"></a>00441         <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> reconnectTimeout;
-<a name="l00442"></a>00442         <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> nextReconnectTime;
-<a name="l00443"></a>00443         <span class="comment"></span>
-<a name="l00444"></a>00444 <span class="comment">        /** @invariant sharedData != NULL */</span>
-<a name="l00445"></a>00445         AnalyticsLoggerSharedDataPtr sharedData;
-<a name="l00446"></a>00446         
-<a name="l00447"></a>00447         <span class="keywordtype">bool</span> connected()<span class="keyword"> const </span>{
-<a name="l00448"></a>00448                 <span class="keywordflow">return</span> sharedData-&gt;client.connected();
-<a name="l00449"></a>00449         }
-<a name="l00450"></a>00450         
-<a name="l00451"></a>00451         <span class="keywordtype">void</span> connect() {
-<a name="l00452"></a>00452                 TRACE_POINT();
-<a name="l00453"></a>00453                 vector&lt;string&gt; args;
-<a name="l00454"></a>00454                 
-<a name="l00455"></a>00455                 sharedData-&gt;client.connect(serverAddress, username, password);
-<a name="l00456"></a>00456                 sharedData-&gt;client.write(<span class="stringliteral">&quot;init&quot;</span>, nodeName.c_str(), NULL);
-<a name="l00457"></a>00457                 <span class="keywordflow">if</span> (!sharedData-&gt;client.read(args)) {
-<a name="l00458"></a>00458                         <span class="keywordflow">throw</span> SystemException(<span class="stringliteral">&quot;Cannot connect to logging server&quot;</span>, ECONNREFUSED);
-<a name="l00459"></a>00459                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (args.size() != 1) {
-<a name="l00460"></a>00460                         <span class="keywordflow">throw</span> IOException(<span class="stringliteral">&quot;Logging server returned an invalid reply for the &#39;init&#39; command&quot;</span>);
-<a name="l00461"></a>00461                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (args[0] == <span class="stringliteral">&quot;server shutting down&quot;</span>) {
-<a name="l00462"></a>00462                         <span class="keywordflow">throw</span> SystemException(<span class="stringliteral">&quot;Cannot connect to server&quot;</span>, ECONNREFUSED);
-<a name="l00463"></a>00463                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (args[0] != <span class="stringliteral">&quot;ok&quot;</span>) {
-<a name="l00464"></a>00464                         <span class="keywordflow">throw</span> IOException(<span class="stringliteral">&quot;Logging server returned an invalid reply for the &#39;init&#39; command&quot;</span>);
+<a name="l00432"></a>00432 <span class="keyword">private</span>:<span class="comment"></span>
+<a name="l00433"></a>00433 <span class="comment">        /** A special lock type for AnalyticsLoggerSharedData that also</span>
+<a name="l00434"></a>00434 <span class="comment">         * keeps a smart pointer to the data structure so that the mutex</span>
+<a name="l00435"></a>00435 <span class="comment">         * is not destroyed prematurely.</span>
+<a name="l00436"></a>00436 <span class="comment">         */</span>
+<a name="l00437"></a>00437         <span class="keyword">struct </span>SharedDataLock {
+<a name="l00438"></a>00438                 AnalyticsLoggerSharedDataPtr sharedData;
+<a name="l00439"></a>00439                 <span class="keywordtype">bool</span> locked;
+<a name="l00440"></a>00440                 
+<a name="l00441"></a>00441                 SharedDataLock(<span class="keyword">const</span> AnalyticsLoggerSharedDataPtr &amp;d)
+<a name="l00442"></a>00442                         : sharedData(d)
+<a name="l00443"></a>00443                 {
+<a name="l00444"></a>00444                         d-&gt;lock.lock();
+<a name="l00445"></a>00445                         locked = <span class="keyword">true</span>;
+<a name="l00446"></a>00446                 }
+<a name="l00447"></a>00447                 
+<a name="l00448"></a>00448                 ~SharedDataLock() {
+<a name="l00449"></a>00449                         <span class="keywordflow">if</span> (locked) {
+<a name="l00450"></a>00450                                 sharedData-&gt;lock.unlock();
+<a name="l00451"></a>00451                         }
+<a name="l00452"></a>00452                 }
+<a name="l00453"></a>00453                 
+<a name="l00454"></a>00454                 <span class="keywordtype">void</span> reset(<span class="keyword">const</span> AnalyticsLoggerSharedDataPtr &amp;d, <span class="keywordtype">bool</span> lockNow = <span class="keyword">true</span>) {
+<a name="l00455"></a>00455                         <span class="keywordflow">if</span> (locked) {
+<a name="l00456"></a>00456                                 sharedData-&gt;lock.unlock();
+<a name="l00457"></a>00457                         }
+<a name="l00458"></a>00458                         sharedData = d;
+<a name="l00459"></a>00459                         <span class="keywordflow">if</span> (lockNow) {
+<a name="l00460"></a>00460                                 sharedData-&gt;lock.lock();
+<a name="l00461"></a>00461                                 locked = <span class="keyword">true</span>;
+<a name="l00462"></a>00462                         } <span class="keywordflow">else</span> {
+<a name="l00463"></a>00463                                 locked = <span class="keyword">false</span>;
+<a name="l00464"></a>00464                         }
 <a name="l00465"></a>00465                 }
 <a name="l00466"></a>00466                 
-<a name="l00467"></a>00467                 <span class="comment">// Upon a write() error we want to attempt to read() the error</span>
-<a name="l00468"></a>00468                 <span class="comment">// message before closing the socket.</span>
-<a name="l00469"></a>00469                 sharedData-&gt;client.setAutoDisconnect(<span class="keyword">false</span>);
-<a name="l00470"></a>00470         }
-<a name="l00471"></a>00471         
-<a name="l00472"></a>00472         <span class="keywordtype">void</span> disconnect(<span class="keywordtype">bool</span> checkErrorResponse = <span class="keyword">false</span>) {
-<a name="l00473"></a>00473                 sharedData-&gt;disconnect(checkErrorResponse);
-<a name="l00474"></a>00474                 <span class="comment">// We create a new SharedData here so that existing AnalyticsLog</span>
-<a name="l00475"></a>00475                 <span class="comment">// objects still refer to the old client object and don&#39;t interfere</span>
-<a name="l00476"></a>00476                 <span class="comment">// with any newly-established connections.</span>
-<a name="l00477"></a>00477                 sharedData.reset(<span class="keyword">new</span> AnalyticsLoggerSharedData());
-<a name="l00478"></a>00478         }
-<a name="l00479"></a>00479         
-<a name="l00480"></a>00480         <span class="keywordtype">bool</span> isNetworkError(<span class="keywordtype">int</span> code)<span class="keyword"> const </span>{
-<a name="l00481"></a>00481                 <span class="keywordflow">return</span> code == EPIPE || code == ECONNREFUSED || code == ECONNRESET
-<a name="l00482"></a>00482                         || code == EHOSTUNREACH || code == ENETDOWN || code == ENETUNREACH
-<a name="l00483"></a>00483                         || code == ETIMEDOUT;
-<a name="l00484"></a>00484         }
-<a name="l00485"></a>00485         
-<a name="l00486"></a>00486 <span class="keyword">public</span>:
-<a name="l00487"></a>00487         AnalyticsLogger() { }
-<a name="l00488"></a>00488         
-<a name="l00489"></a>00489         AnalyticsLogger(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;serverAddress, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;username,
-<a name="l00490"></a>00490                         <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;password, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;nodeName = <span class="stringliteral">&quot;&quot;</span>)
-<a name="l00491"></a>00491         {
-<a name="l00492"></a>00492                 this-&gt;serverAddress  = serverAddress;
-<a name="l00493"></a>00493                 this-&gt;username       = username;
-<a name="l00494"></a>00494                 this-&gt;password       = password;
-<a name="l00495"></a>00495                 <span class="keywordflow">if</span> (nodeName.empty()) {
-<a name="l00496"></a>00496                         this-&gt;nodeName = <a class="code" href="namespacePassenger.html#a1d0a66b0e207c46dc6124ff3b2f331e6" title="Returns the system&amp;#39;s host name.">getHostName</a>();
-<a name="l00497"></a>00497                 } <span class="keywordflow">else</span> {
-<a name="l00498"></a>00498                         this-&gt;nodeName = nodeName;
-<a name="l00499"></a>00499                 }
-<a name="l00500"></a>00500                 <span class="keywordflow">if</span> (!serverAddress.empty()) {
-<a name="l00501"></a>00501                         sharedData.reset(<span class="keyword">new</span> AnalyticsLoggerSharedData());
-<a name="l00502"></a>00502                 }
-<a name="l00503"></a>00503                 <span class="keywordflow">if</span> (isLocalSocketAddress(serverAddress)) {
-<a name="l00504"></a>00504                         maxConnectTries = 10;
-<a name="l00505"></a>00505                 } <span class="keywordflow">else</span> {
-<a name="l00506"></a>00506                         maxConnectTries = 1;
-<a name="l00507"></a>00507                 }
-<a name="l00508"></a>00508                 maxConnectTries   = 10;
-<a name="l00509"></a>00509                 reconnectTimeout  = 60 * 1000000;
-<a name="l00510"></a>00510                 nextReconnectTime = 0;
-<a name="l00511"></a>00511         }
-<a name="l00512"></a>00512         
-<a name="l00513"></a>00513         AnalyticsLogPtr newTransaction(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;groupName, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;category = <span class="stringliteral">&quot;requests&quot;</span>,
-<a name="l00514"></a>00514                 <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;unionStationKey = <span class="keywordtype">string</span>())
-<a name="l00515"></a>00515         {
-<a name="l00516"></a>00516                 <span class="keywordflow">if</span> (serverAddress.empty()) {
-<a name="l00517"></a>00517                         <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> AnalyticsLog());
-<a name="l00518"></a>00518                 }
-<a name="l00519"></a>00519                 
-<a name="l00520"></a>00520                 <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> timestamp = SystemTime::getUsec();
-<a name="l00521"></a>00521                 <span class="keywordtype">char</span> txnId[
-<a name="l00522"></a>00522                         2 * <span class="keyword">sizeof</span>(<span class="keywordtype">unsigned</span> int) +    <span class="comment">// max hex timestamp size</span>
-<a name="l00523"></a>00523                         11 +                          <span class="comment">// space for a random identifier</span>
-<a name="l00524"></a>00524                         1                             <span class="comment">// null terminator</span>
-<a name="l00525"></a>00525                 ];
-<a name="l00526"></a>00526                 <span class="keywordtype">char</span> *end;
-<a name="l00527"></a>00527                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> timestampSize;
-<a name="l00528"></a>00528                 <span class="keywordtype">char</span> timestampStr[2 * <span class="keyword">sizeof</span>(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> long) + 1];
-<a name="l00529"></a>00529                 
-<a name="l00530"></a>00530                 <span class="comment">// &quot;[timestamp]&quot;</span>
-<a name="l00531"></a>00531                 <span class="comment">// Our timestamp is like a Unix timestamp but with minutes</span>
-<a name="l00532"></a>00532                 <span class="comment">// resolution instead of seconds. 32 bits will last us for</span>
-<a name="l00533"></a>00533                 <span class="comment">// about 8000 years.</span>
-<a name="l00534"></a>00534                 timestampSize = integerToHexatri&lt;unsigned int&gt;(timestamp / 1000000 / 60,
-<a name="l00535"></a>00535                         txnId);
-<a name="l00536"></a>00536                 end = txnId + timestampSize;
-<a name="l00537"></a>00537                 
-<a name="l00538"></a>00538                 <span class="comment">// &quot;[timestamp]-&quot;</span>
-<a name="l00539"></a>00539                 *end = <span class="charliteral">&#39;-&#39;</span>;
-<a name="l00540"></a>00540                 end++;
-<a name="l00541"></a>00541                 
-<a name="l00542"></a>00542                 <span class="comment">// &quot;[timestamp]-[random id]&quot;</span>
-<a name="l00543"></a>00543                 randomGenerator.generateAsciiString(end, 11);
-<a name="l00544"></a>00544                 end += 11;
-<a name="l00545"></a>00545                 *end = <span class="charliteral">&#39;\0&#39;</span>;
-<a name="l00546"></a>00546                 
-<a name="l00547"></a>00547                 integerToHexatri&lt;unsigned long long&gt;(timestamp, timestampStr);
-<a name="l00548"></a>00548                 
-<a name="l00549"></a>00549                 lock_guard&lt;boost::mutex&gt; l(sharedData-&gt;lock);
-<a name="l00550"></a>00550                 
-<a name="l00551"></a>00551                 <span class="keywordflow">if</span> (SystemTime::getUsec() &gt;= nextReconnectTime) {
-<a name="l00552"></a>00552                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> tryCount = 0;
-<a name="l00553"></a>00553                         
-<a name="l00554"></a>00554                         <span class="keywordflow">while</span> (tryCount &lt; maxConnectTries) {
-<a name="l00555"></a>00555                                 <span class="keywordflow">try</span> {
-<a name="l00556"></a>00556                                         <span class="keywordflow">if</span> (!connected()) {
-<a name="l00557"></a>00557                                                 TRACE_POINT();
-<a name="l00558"></a>00558                                                 connect();
-<a name="l00559"></a>00559                                         }
-<a name="l00560"></a>00560                                         sharedData-&gt;client.write(<span class="stringliteral">&quot;openTransaction&quot;</span>,
-<a name="l00561"></a>00561                                                 txnId,
-<a name="l00562"></a>00562                                                 groupName.c_str(),
-<a name="l00563"></a>00563                                                 <span class="stringliteral">&quot;&quot;</span>,
-<a name="l00564"></a>00564                                                 category.c_str(),
-<a name="l00565"></a>00565                                                 timestampStr,
-<a name="l00566"></a>00566                                                 unionStationKey.c_str(),
-<a name="l00567"></a>00567                                                 <span class="stringliteral">&quot;true&quot;</span>,
-<a name="l00568"></a>00568                                                 NULL);
-<a name="l00569"></a>00569                                         <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> AnalyticsLog(sharedData,
-<a name="l00570"></a>00570                                                 <span class="keywordtype">string</span>(txnId, end - txnId),
-<a name="l00571"></a>00571                                                 groupName, category,
-<a name="l00572"></a>00572                                                 unionStationKey));
-<a name="l00573"></a>00573                                 } <span class="keywordflow">catch</span> (<span class="keyword">const</span> SystemException &amp;e) {
-<a name="l00574"></a>00574                                         TRACE_POINT();
-<a name="l00575"></a>00575                                         <span class="keywordflow">if</span> (e.code() == ENOENT || isNetworkError(e.code())) {
-<a name="l00576"></a>00576                                                 tryCount++;
-<a name="l00577"></a>00577                                                 disconnect(<span class="keyword">true</span>);
-<a name="l00578"></a>00578                                                 <span class="keywordflow">if</span> (tryCount &lt; maxConnectTries) {
-<a name="l00579"></a>00579                                                         syscalls::usleep(RETRY_SLEEP);
-<a name="l00580"></a>00580                                                 }
-<a name="l00581"></a>00581                                         } <span class="keywordflow">else</span> {
-<a name="l00582"></a>00582                                                 disconnect();
-<a name="l00583"></a>00583                                                 <span class="keywordflow">throw</span>;
-<a name="l00584"></a>00584                                         }
-<a name="l00585"></a>00585                                 }
-<a name="l00586"></a>00586                                 
-<a name="l00587"></a>00587                                 <span class="comment">// Failed to connect.</span>
-<a name="l00588"></a>00588                                 P_WARN(<span class="stringliteral">&quot;Cannot connect to the logging agent (&quot;</span> &lt;&lt; serverAddress &lt;&lt; <span class="stringliteral">&quot;); &quot;</span> &lt;&lt;
-<a name="l00589"></a>00589                                         <span class="stringliteral">&quot;retrying in &quot;</span> &lt;&lt; reconnectTimeout / 1000000 &lt;&lt; <span class="stringliteral">&quot; seconds.&quot;</span>);
-<a name="l00590"></a>00590                                 nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
-<a name="l00591"></a>00591                         }
-<a name="l00592"></a>00592                 }
-<a name="l00593"></a>00593                 <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> AnalyticsLog());
-<a name="l00594"></a>00594         }
-<a name="l00595"></a>00595         
-<a name="l00596"></a>00596         AnalyticsLogPtr continueTransaction(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;txnId, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;groupName,
-<a name="l00597"></a>00597                 <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;category = <span class="stringliteral">&quot;requests&quot;</span>, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;unionStationKey = <span class="keywordtype">string</span>())
-<a name="l00598"></a>00598         {
-<a name="l00599"></a>00599                 <span class="keywordflow">if</span> (serverAddress.empty() || txnId.empty()) {
-<a name="l00600"></a>00600                         <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> AnalyticsLog());
-<a name="l00601"></a>00601                 }
-<a name="l00602"></a>00602                 
-<a name="l00603"></a>00603                 <span class="keywordtype">char</span> timestampStr[2 * <span class="keyword">sizeof</span>(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> long) + 1];
-<a name="l00604"></a>00604                 integerToHexatri&lt;unsigned long long&gt;(SystemTime::getUsec(), timestampStr);
-<a name="l00605"></a>00605                 
-<a name="l00606"></a>00606                 lock_guard&lt;boost::mutex&gt; l(sharedData-&gt;lock);
-<a name="l00607"></a>00607                 
-<a name="l00608"></a>00608                 <span class="keywordflow">if</span> (SystemTime::getUsec() &gt;= nextReconnectTime) {
-<a name="l00609"></a>00609                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> tryCount = 0;
-<a name="l00610"></a>00610                         
-<a name="l00611"></a>00611                         <span class="keywordflow">while</span> (tryCount &lt; maxConnectTries) {
-<a name="l00612"></a>00612                                 <span class="keywordflow">try</span> {
-<a name="l00613"></a>00613                                         <span class="keywordflow">if</span> (!connected()) {
-<a name="l00614"></a>00614                                                 TRACE_POINT();
-<a name="l00615"></a>00615                                                 connect();
-<a name="l00616"></a>00616                                         }
-<a name="l00617"></a>00617                                         sharedData-&gt;client.write(<span class="stringliteral">&quot;openTransaction&quot;</span>,
-<a name="l00618"></a>00618                                                 txnId.c_str(),
-<a name="l00619"></a>00619                                                 groupName.c_str(),
-<a name="l00620"></a>00620                                                 <span class="stringliteral">&quot;&quot;</span>,
-<a name="l00621"></a>00621                                                 category.c_str(),
-<a name="l00622"></a>00622                                                 timestampStr,
-<a name="l00623"></a>00623                                                 unionStationKey.c_str(),
-<a name="l00624"></a>00624                                                 <span class="stringliteral">&quot;true&quot;</span>,
-<a name="l00625"></a>00625                                                 NULL);
-<a name="l00626"></a>00626                                         <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> AnalyticsLog(sharedData,
-<a name="l00627"></a>00627                                                 txnId, groupName, category,
-<a name="l00628"></a>00628                                                 unionStationKey));
-<a name="l00629"></a>00629                                 } <span class="keywordflow">catch</span> (<span class="keyword">const</span> SystemException &amp;e) {
-<a name="l00630"></a>00630                                         TRACE_POINT();
-<a name="l00631"></a>00631                                         <span class="keywordflow">if</span> (e.code() == EPIPE || isNetworkError(e.code())) {
-<a name="l00632"></a>00632                                                 tryCount++;
-<a name="l00633"></a>00633                                                 disconnect(<span class="keyword">true</span>);
-<a name="l00634"></a>00634                                                 <span class="keywordflow">if</span> (tryCount &lt; maxConnectTries) {
-<a name="l00635"></a>00635                                                         syscalls::usleep(RETRY_SLEEP);
-<a name="l00636"></a>00636                                                 }
-<a name="l00637"></a>00637                                         } <span class="keywordflow">else</span> {
-<a name="l00638"></a>00638                                                 disconnect();
-<a name="l00639"></a>00639                                                 <span class="keywordflow">throw</span>;
-<a name="l00640"></a>00640                                         }
-<a name="l00641"></a>00641                                 }
-<a name="l00642"></a>00642                         }
-<a name="l00643"></a>00643                         
-<a name="l00644"></a>00644                         <span class="comment">// Failed to connect.</span>
-<a name="l00645"></a>00645                         P_WARN(<span class="stringliteral">&quot;Cannot connect to the logging agent (&quot;</span> &lt;&lt; serverAddress &lt;&lt; <span class="stringliteral">&quot;); &quot;</span> &lt;&lt;
-<a name="l00646"></a>00646                                 <span class="stringliteral">&quot;retrying in &quot;</span> &lt;&lt; reconnectTimeout / 1000000 &lt;&lt; <span class="stringliteral">&quot; seconds.&quot;</span>);
-<a name="l00647"></a>00647                         nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
-<a name="l00648"></a>00648                 }
-<a name="l00649"></a>00649                 <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> AnalyticsLog());
-<a name="l00650"></a>00650         }
-<a name="l00651"></a>00651         
-<a name="l00652"></a>00652         <span class="keywordtype">void</span> setMaxConnectTries(<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> value) {
-<a name="l00653"></a>00653                 lock_guard&lt;boost::mutex&gt; l(sharedData-&gt;lock);
-<a name="l00654"></a>00654                 maxConnectTries = value;
-<a name="l00655"></a>00655         }
-<a name="l00656"></a>00656         
-<a name="l00657"></a>00657         <span class="keywordtype">void</span> setReconnectTimeout(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> usec) {
-<a name="l00658"></a>00658                 lock_guard&lt;boost::mutex&gt; l(sharedData-&gt;lock);
-<a name="l00659"></a>00659                 reconnectTimeout = usec;
-<a name="l00660"></a>00660         }
-<a name="l00661"></a>00661         
-<a name="l00662"></a>00662         <span class="keywordtype">bool</span> isNull()<span class="keyword"> const </span>{
-<a name="l00663"></a>00663                 <span class="keywordflow">return</span> serverAddress.empty();
-<a name="l00664"></a>00664         }
-<a name="l00665"></a>00665         
-<a name="l00666"></a>00666         <span class="keywordtype">string</span> getAddress()<span class="keyword"> const </span>{
-<a name="l00667"></a>00667                 <span class="keywordflow">return</span> serverAddress;
-<a name="l00668"></a>00668         }
-<a name="l00669"></a>00669         
-<a name="l00670"></a>00670         <span class="keywordtype">string</span> getUsername()<span class="keyword"> const </span>{
-<a name="l00671"></a>00671                 <span class="keywordflow">return</span> username;
-<a name="l00672"></a>00672         }
-<a name="l00673"></a>00673         
-<a name="l00674"></a>00674         <span class="keywordtype">string</span> getPassword()<span class="keyword"> const </span>{
-<a name="l00675"></a>00675                 <span class="keywordflow">return</span> password;
-<a name="l00676"></a>00676         }
-<a name="l00677"></a>00677         
-<a name="l00678"></a>00678         FileDescriptor getConnection()<span class="keyword"> const </span>{
-<a name="l00679"></a>00679                 <span class="keywordflow">return</span> sharedData-&gt;client.getConnection();
-<a name="l00680"></a>00680         }
-<a name="l00681"></a>00681         <span class="comment"></span>
-<a name="l00682"></a>00682 <span class="comment">        /**</span>
-<a name="l00683"></a>00683 <span class="comment">         * @post !result.empty()</span>
-<a name="l00684"></a>00684 <span class="comment">         */</span>
-<a name="l00685"></a>00685         <span class="keywordtype">string</span> getNodeName()<span class="keyword"> const </span>{
-<a name="l00686"></a>00686                 <span class="keywordflow">return</span> nodeName;
-<a name="l00687"></a>00687         }
-<a name="l00688"></a>00688 };
-<a name="l00689"></a>00689 
-<a name="l00690"></a>00690 <span class="keyword">typedef</span> shared_ptr&lt;AnalyticsLogger&gt; AnalyticsLoggerPtr;
-<a name="l00691"></a>00691 
-<a name="l00692"></a>00692 } <span class="comment">// namespace Passenger</span>
-<a name="l00693"></a>00693 
-<a name="l00694"></a>00694 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_LOGGING_H_ */</span>
-<a name="l00695"></a>00695 
+<a name="l00467"></a>00467                 <span class="keywordtype">void</span> lock() {
+<a name="l00468"></a>00468                         assert(!locked);
+<a name="l00469"></a>00469                         sharedData-&gt;lock.lock();
+<a name="l00470"></a>00470                         locked = <span class="keyword">true</span>;
+<a name="l00471"></a>00471                 }
+<a name="l00472"></a>00472         };
+<a name="l00473"></a>00473         
+<a name="l00474"></a>00474         <span class="keyword">static</span> <span class="keyword">const</span> <span class="keywordtype">int</span> RETRY_SLEEP = 200000; <span class="comment">// microseconds</span>
+<a name="l00475"></a>00475         
+<a name="l00476"></a>00476         <span class="keywordtype">string</span> serverAddress;
+<a name="l00477"></a>00477         <span class="keywordtype">string</span> username;
+<a name="l00478"></a>00478         <span class="keywordtype">string</span> password;
+<a name="l00479"></a>00479         <span class="keywordtype">string</span> nodeName;
+<a name="l00480"></a>00480         RandomGenerator randomGenerator;
+<a name="l00481"></a>00481         <span class="comment"></span>
+<a name="l00482"></a>00482 <span class="comment">        /** Lock protecting the fields that follow, but not the contents of the shared data. */</span>
+<a name="l00483"></a>00483         <span class="keyword">mutable</span> boost::mutex lock;
+<a name="l00484"></a>00484         
+<a name="l00485"></a>00485         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> maxConnectTries;
+<a name="l00486"></a>00486         <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> reconnectTimeout;
+<a name="l00487"></a>00487         <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> nextReconnectTime;<span class="comment"></span>
+<a name="l00488"></a>00488 <span class="comment">        /** @invariant sharedData != NULL */</span>
+<a name="l00489"></a>00489         AnalyticsLoggerSharedDataPtr sharedData;
+<a name="l00490"></a>00490         
+<a name="l00491"></a>00491         <span class="keywordtype">bool</span> connected()<span class="keyword"> const </span>{
+<a name="l00492"></a>00492                 <span class="keywordflow">return</span> sharedData-&gt;client.connected();
+<a name="l00493"></a>00493         }
+<a name="l00494"></a>00494         
+<a name="l00495"></a>00495         <span class="keywordtype">void</span> connect() {
+<a name="l00496"></a>00496                 TRACE_POINT();
+<a name="l00497"></a>00497                 vector&lt;string&gt; args;
+<a name="l00498"></a>00498                 
+<a name="l00499"></a>00499                 sharedData-&gt;client.connect(serverAddress, username, password);
+<a name="l00500"></a>00500                 sharedData-&gt;client.write(<span class="stringliteral">&quot;init&quot;</span>, nodeName.c_str(), NULL);
+<a name="l00501"></a>00501                 <span class="keywordflow">if</span> (!sharedData-&gt;client.read(args)) {
+<a name="l00502"></a>00502                         <span class="keywordflow">throw</span> SystemException(<span class="stringliteral">&quot;Cannot connect to logging server&quot;</span>, ECONNREFUSED);
+<a name="l00503"></a>00503                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (args.size() != 1) {
+<a name="l00504"></a>00504                         <span class="keywordflow">throw</span> IOException(<span class="stringliteral">&quot;Logging server returned an invalid reply for the &#39;init&#39; command&quot;</span>);
+<a name="l00505"></a>00505                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (args[0] == <span class="stringliteral">&quot;server shutting down&quot;</span>) {
+<a name="l00506"></a>00506                         <span class="keywordflow">throw</span> SystemException(<span class="stringliteral">&quot;Cannot connect to server&quot;</span>, ECONNREFUSED);
+<a name="l00507"></a>00507                 } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (args[0] != <span class="stringliteral">&quot;ok&quot;</span>) {
+<a name="l00508"></a>00508                         <span class="keywordflow">throw</span> IOException(<span class="stringliteral">&quot;Logging server returned an invalid reply for the &#39;init&#39; command&quot;</span>);
+<a name="l00509"></a>00509                 }
+<a name="l00510"></a>00510                 
+<a name="l00511"></a>00511                 <span class="comment">// Upon a write() error we want to attempt to read() the error</span>
+<a name="l00512"></a>00512                 <span class="comment">// message before closing the socket.</span>
+<a name="l00513"></a>00513                 sharedData-&gt;client.setAutoDisconnect(<span class="keyword">false</span>);
+<a name="l00514"></a>00514         }
+<a name="l00515"></a>00515         
+<a name="l00516"></a>00516         <span class="keywordtype">void</span> disconnect(<span class="keywordtype">bool</span> checkErrorResponse = <span class="keyword">false</span>) {
+<a name="l00517"></a>00517                 sharedData-&gt;disconnect(checkErrorResponse);
+<a name="l00518"></a>00518                 <span class="comment">// We create a new SharedData here so that existing AnalyticsLog</span>
+<a name="l00519"></a>00519                 <span class="comment">// objects still refer to the old client object and don&#39;t interfere</span>
+<a name="l00520"></a>00520                 <span class="comment">// with any newly-established connections.</span>
+<a name="l00521"></a>00521                 sharedData.reset(<span class="keyword">new</span> AnalyticsLoggerSharedData());
+<a name="l00522"></a>00522         }
+<a name="l00523"></a>00523         
+<a name="l00524"></a>00524         <span class="keywordtype">bool</span> isNetworkError(<span class="keywordtype">int</span> code)<span class="keyword"> const </span>{
+<a name="l00525"></a>00525                 <span class="keywordflow">return</span> code == EPIPE || code == ECONNREFUSED || code == ECONNRESET
+<a name="l00526"></a>00526                         || code == EHOSTUNREACH || code == ENETDOWN || code == ENETUNREACH
+<a name="l00527"></a>00527                         || code == ETIMEDOUT;
+<a name="l00528"></a>00528         }
+<a name="l00529"></a>00529         
+<a name="l00530"></a>00530 <span class="keyword">public</span>:
+<a name="l00531"></a>00531         AnalyticsLogger() { }
+<a name="l00532"></a>00532         
+<a name="l00533"></a>00533         AnalyticsLogger(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;serverAddress, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;username,
+<a name="l00534"></a>00534                         <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;password, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;nodeName = <span class="stringliteral">&quot;&quot;</span>)
+<a name="l00535"></a>00535         {
+<a name="l00536"></a>00536                 this-&gt;serverAddress  = serverAddress;
+<a name="l00537"></a>00537                 this-&gt;username       = username;
+<a name="l00538"></a>00538                 this-&gt;password       = password;
+<a name="l00539"></a>00539                 <span class="keywordflow">if</span> (nodeName.empty()) {
+<a name="l00540"></a>00540                         this-&gt;nodeName = <a class="code" href="namespacePassenger.html#a1d0a66b0e207c46dc6124ff3b2f331e6" title="Returns the system&amp;#39;s host name.">getHostName</a>();
+<a name="l00541"></a>00541                 } <span class="keywordflow">else</span> {
+<a name="l00542"></a>00542                         this-&gt;nodeName = nodeName;
+<a name="l00543"></a>00543                 }
+<a name="l00544"></a>00544                 <span class="keywordflow">if</span> (!serverAddress.empty()) {
+<a name="l00545"></a>00545                         sharedData.reset(<span class="keyword">new</span> AnalyticsLoggerSharedData());
+<a name="l00546"></a>00546                 }
+<a name="l00547"></a>00547                 <span class="keywordflow">if</span> (isLocalSocketAddress(serverAddress)) {
+<a name="l00548"></a>00548                         maxConnectTries = 10;
+<a name="l00549"></a>00549                 } <span class="keywordflow">else</span> {
+<a name="l00550"></a>00550                         maxConnectTries = 1;
+<a name="l00551"></a>00551                 }
+<a name="l00552"></a>00552                 maxConnectTries   = 10;
+<a name="l00553"></a>00553                 reconnectTimeout  = 60 * 1000000;
+<a name="l00554"></a>00554                 nextReconnectTime = 0;
+<a name="l00555"></a>00555         }
+<a name="l00556"></a>00556         
+<a name="l00557"></a>00557         AnalyticsLogPtr newTransaction(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;groupName, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;category = <span class="stringliteral">&quot;requests&quot;</span>,
+<a name="l00558"></a>00558                 <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;unionStationKey = <span class="keywordtype">string</span>(),
+<a name="l00559"></a>00559                 <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;filters = <span class="keywordtype">string</span>())
+<a name="l00560"></a>00560         {
+<a name="l00561"></a>00561                 <span class="keywordflow">if</span> (serverAddress.empty()) {
+<a name="l00562"></a>00562                         <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> AnalyticsLog());
+<a name="l00563"></a>00563                 }
+<a name="l00564"></a>00564                 
+<a name="l00565"></a>00565                 <span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> timestamp = SystemTime::getUsec();
+<a name="l00566"></a>00566                 <span class="keywordtype">char</span> txnId[
+<a name="l00567"></a>00567                         2 * <span class="keyword">sizeof</span>(<span class="keywordtype">unsigned</span> int) +    <span class="comment">// max hex timestamp size</span>
+<a name="l00568"></a>00568                         11 +                          <span class="comment">// space for a random identifier</span>
+<a name="l00569"></a>00569                         1                             <span class="comment">// null terminator</span>
+<a name="l00570"></a>00570                 ];
+<a name="l00571"></a>00571                 <span class="keywordtype">char</span> *end;
+<a name="l00572"></a>00572                 <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> timestampSize;
+<a name="l00573"></a>00573                 <span class="keywordtype">char</span> timestampStr[2 * <span class="keyword">sizeof</span>(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> long) + 1];
+<a name="l00574"></a>00574                 
+<a name="l00575"></a>00575                 <span class="comment">// &quot;[timestamp]&quot;</span>
+<a name="l00576"></a>00576                 <span class="comment">// Our timestamp is like a Unix timestamp but with minutes</span>
+<a name="l00577"></a>00577                 <span class="comment">// resolution instead of seconds. 32 bits will last us for</span>
+<a name="l00578"></a>00578                 <span class="comment">// about 8000 years.</span>
+<a name="l00579"></a>00579                 timestampSize = integerToHexatri&lt;unsigned int&gt;(timestamp / 1000000 / 60,
+<a name="l00580"></a>00580                         txnId);
+<a name="l00581"></a>00581                 end = txnId + timestampSize;
+<a name="l00582"></a>00582                 
+<a name="l00583"></a>00583                 <span class="comment">// &quot;[timestamp]-&quot;</span>
+<a name="l00584"></a>00584                 *end = <span class="charliteral">&#39;-&#39;</span>;
+<a name="l00585"></a>00585                 end++;
+<a name="l00586"></a>00586                 
+<a name="l00587"></a>00587                 <span class="comment">// &quot;[timestamp]-[random id]&quot;</span>
+<a name="l00588"></a>00588                 randomGenerator.generateAsciiString(end, 11);
+<a name="l00589"></a>00589                 end += 11;
+<a name="l00590"></a>00590                 *end = <span class="charliteral">&#39;\0&#39;</span>;
+<a name="l00591"></a>00591                 
+<a name="l00592"></a>00592                 integerToHexatri&lt;unsigned long long&gt;(timestamp, timestampStr);
+<a name="l00593"></a>00593                 
+<a name="l00594"></a>00594                 unique_lock&lt;boost::mutex&gt; l(lock);
+<a name="l00595"></a>00595                 SharedDataLock sl(sharedData);
+<a name="l00596"></a>00596                 
+<a name="l00597"></a>00597                 <span class="keywordflow">if</span> (SystemTime::getUsec() &gt;= nextReconnectTime) {
+<a name="l00598"></a>00598                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> tryCount = 0;
+<a name="l00599"></a>00599                         
+<a name="l00600"></a>00600                         <span class="keywordflow">while</span> (tryCount &lt; maxConnectTries) {
+<a name="l00601"></a>00601                                 <span class="keywordflow">try</span> {
+<a name="l00602"></a>00602                                         <span class="keywordflow">if</span> (!connected()) {
+<a name="l00603"></a>00603                                                 TRACE_POINT();
+<a name="l00604"></a>00604                                                 connect();
+<a name="l00605"></a>00605                                         }
+<a name="l00606"></a>00606                                         sharedData-&gt;client.write(<span class="stringliteral">&quot;openTransaction&quot;</span>,
+<a name="l00607"></a>00607                                                 txnId,
+<a name="l00608"></a>00608                                                 groupName.c_str(),
+<a name="l00609"></a>00609                                                 <span class="stringliteral">&quot;&quot;</span>,
+<a name="l00610"></a>00610                                                 category.c_str(),
+<a name="l00611"></a>00611                                                 timestampStr,
+<a name="l00612"></a>00612                                                 unionStationKey.c_str(),
+<a name="l00613"></a>00613                                                 <span class="stringliteral">&quot;true&quot;</span>,
+<a name="l00614"></a>00614                                                 <span class="stringliteral">&quot;true&quot;</span>,
+<a name="l00615"></a>00615                                                 filters.c_str(),
+<a name="l00616"></a>00616                                                 NULL);
+<a name="l00617"></a>00617                                         
+<a name="l00618"></a>00618                                         vector&lt;string&gt; args;
+<a name="l00619"></a>00619                                         sharedData-&gt;client.read(args);
+<a name="l00620"></a>00620                                         <span class="keywordflow">if</span> (args.size() == 2 &amp;&amp; args[0] == <span class="stringliteral">&quot;error&quot;</span>) {
+<a name="l00621"></a>00621                                                 disconnect();
+<a name="l00622"></a>00622                                                 <span class="keywordflow">throw</span> IOException(<span class="stringliteral">&quot;The logging server responded with an error: &quot;</span> + args[1]);
+<a name="l00623"></a>00623                                         } <span class="keywordflow">else</span> <span class="keywordflow">if</span> (args.empty() || args[0] != <span class="stringliteral">&quot;ok&quot;</span>) {
+<a name="l00624"></a>00624                                                 disconnect();
+<a name="l00625"></a>00625                                                 <span class="keywordflow">throw</span> IOException(<span class="stringliteral">&quot;The logging server sent an unexpected reply.&quot;</span>);
+<a name="l00626"></a>00626                                         }
+<a name="l00627"></a>00627                                         
+<a name="l00628"></a>00628                                         <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> AnalyticsLog(sharedData,
+<a name="l00629"></a>00629                                                 <span class="keywordtype">string</span>(txnId, end - txnId),
+<a name="l00630"></a>00630                                                 groupName, category,
+<a name="l00631"></a>00631                                                 unionStationKey));
+<a name="l00632"></a>00632                                 } <span class="keywordflow">catch</span> (<span class="keyword">const</span> SystemException &amp;e) {
+<a name="l00633"></a>00633                                         TRACE_POINT();
+<a name="l00634"></a>00634                                         <span class="keywordflow">if</span> (e.code() == ENOENT || isNetworkError(e.code())) {
+<a name="l00635"></a>00635                                                 tryCount++;
+<a name="l00636"></a>00636                                                 disconnect(<span class="keyword">true</span>);
+<a name="l00637"></a>00637                                                 sl.reset(sharedData, <span class="keyword">false</span>);
+<a name="l00638"></a>00638                                                 l.unlock();
+<a name="l00639"></a>00639                                                 <span class="keywordflow">if</span> (tryCount &lt; maxConnectTries) {
+<a name="l00640"></a>00640                                                         syscalls::usleep(RETRY_SLEEP);
+<a name="l00641"></a>00641                                                 }
+<a name="l00642"></a>00642                                                 l.lock();
+<a name="l00643"></a>00643                                                 sl.lock();
+<a name="l00644"></a>00644                                         } <span class="keywordflow">else</span> {
+<a name="l00645"></a>00645                                                 disconnect();
+<a name="l00646"></a>00646                                                 <span class="keywordflow">throw</span>;
+<a name="l00647"></a>00647                                         }
+<a name="l00648"></a>00648                                 }
+<a name="l00649"></a>00649                                 
+<a name="l00650"></a>00650                                 <span class="comment">// Failed to connect.</span>
+<a name="l00651"></a>00651                                 P_WARN(<span class="stringliteral">&quot;Cannot connect to the logging agent (&quot;</span> &lt;&lt; serverAddress &lt;&lt; <span class="stringliteral">&quot;); &quot;</span> &lt;&lt;
+<a name="l00652"></a>00652                                         <span class="stringliteral">&quot;retrying in &quot;</span> &lt;&lt; reconnectTimeout / 1000000 &lt;&lt; <span class="stringliteral">&quot; seconds.&quot;</span>);
+<a name="l00653"></a>00653                                 nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
+<a name="l00654"></a>00654                         }
+<a name="l00655"></a>00655                 }
+<a name="l00656"></a>00656                 <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> AnalyticsLog());
+<a name="l00657"></a>00657         }
+<a name="l00658"></a>00658         
+<a name="l00659"></a>00659         AnalyticsLogPtr continueTransaction(<span class="keyword">const</span> <span class="keywordtype">string</span> &amp;txnId, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;groupName,
+<a name="l00660"></a>00660                 <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;category = <span class="stringliteral">&quot;requests&quot;</span>, <span class="keyword">const</span> <span class="keywordtype">string</span> &amp;unionStationKey = <span class="keywordtype">string</span>())
+<a name="l00661"></a>00661         {
+<a name="l00662"></a>00662                 <span class="keywordflow">if</span> (serverAddress.empty() || txnId.empty()) {
+<a name="l00663"></a>00663                         <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> AnalyticsLog());
+<a name="l00664"></a>00664                 }
+<a name="l00665"></a>00665                 
+<a name="l00666"></a>00666                 <span class="keywordtype">char</span> timestampStr[2 * <span class="keyword">sizeof</span>(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> long) + 1];
+<a name="l00667"></a>00667                 integerToHexatri&lt;unsigned long long&gt;(SystemTime::getUsec(), timestampStr);
+<a name="l00668"></a>00668                 
+<a name="l00669"></a>00669                 unique_lock&lt;boost::mutex&gt; l(lock);
+<a name="l00670"></a>00670                 SharedDataLock sl(sharedData);
+<a name="l00671"></a>00671                 
+<a name="l00672"></a>00672                 <span class="keywordflow">if</span> (SystemTime::getUsec() &gt;= nextReconnectTime) {
+<a name="l00673"></a>00673                         <span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> tryCount = 0;
+<a name="l00674"></a>00674                         
+<a name="l00675"></a>00675                         <span class="keywordflow">while</span> (tryCount &lt; maxConnectTries) {
+<a name="l00676"></a>00676                                 <span class="keywordflow">try</span> {
+<a name="l00677"></a>00677                                         <span class="keywordflow">if</span> (!connected()) {
+<a name="l00678"></a>00678                                                 TRACE_POINT();
+<a name="l00679"></a>00679                                                 connect();
+<a name="l00680"></a>00680                                         }
+<a name="l00681"></a>00681                                         sharedData-&gt;client.write(<span class="stringliteral">&quot;openTransaction&quot;</span>,
+<a name="l00682"></a>00682                                                 txnId.c_str(),
+<a name="l00683"></a>00683                                                 groupName.c_str(),
+<a name="l00684"></a>00684                                                 <span class="stringliteral">&quot;&quot;</span>,
+<a name="l00685"></a>00685                                                 category.c_str(),
+<a name="l00686"></a>00686                                                 timestampStr,
+<a name="l00687"></a>00687                                                 unionStationKey.c_str(),
+<a name="l00688"></a>00688                                                 <span class="stringliteral">&quot;true&quot;</span>,
+<a name="l00689"></a>00689                                                 NULL);
+<a name="l00690"></a>00690                                         <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> AnalyticsLog(sharedData,
+<a name="l00691"></a>00691                                                 txnId, groupName, category,
+<a name="l00692"></a>00692                                                 unionStationKey));
+<a name="l00693"></a>00693                                 } <span class="keywordflow">catch</span> (<span class="keyword">const</span> SystemException &amp;e) {
+<a name="l00694"></a>00694                                         TRACE_POINT();
+<a name="l00695"></a>00695                                         <span class="keywordflow">if</span> (e.code() == EPIPE || isNetworkError(e.code())) {
+<a name="l00696"></a>00696                                                 tryCount++;
+<a name="l00697"></a>00697                                                 disconnect(<span class="keyword">true</span>);
+<a name="l00698"></a>00698                                                 sl.reset(sharedData, <span class="keyword">false</span>);
+<a name="l00699"></a>00699                                                 l.unlock();
+<a name="l00700"></a>00700                                                 <span class="keywordflow">if</span> (tryCount &lt; maxConnectTries) {
+<a name="l00701"></a>00701                                                         syscalls::usleep(RETRY_SLEEP);
+<a name="l00702"></a>00702                                                 }
+<a name="l00703"></a>00703                                                 l.lock();
+<a name="l00704"></a>00704                                                 sl.lock();
+<a name="l00705"></a>00705                                         } <span class="keywordflow">else</span> {
+<a name="l00706"></a>00706                                                 disconnect();
+<a name="l00707"></a>00707                                                 <span class="keywordflow">throw</span>;
+<a name="l00708"></a>00708                                         }
+<a name="l00709"></a>00709                                 }
+<a name="l00710"></a>00710                         }
+<a name="l00711"></a>00711                         
+<a name="l00712"></a>00712                         <span class="comment">// Failed to connect.</span>
+<a name="l00713"></a>00713                         P_WARN(<span class="stringliteral">&quot;Cannot connect to the logging agent (&quot;</span> &lt;&lt; serverAddress &lt;&lt; <span class="stringliteral">&quot;); &quot;</span> &lt;&lt;
+<a name="l00714"></a>00714                                 <span class="stringliteral">&quot;retrying in &quot;</span> &lt;&lt; reconnectTimeout / 1000000 &lt;&lt; <span class="stringliteral">&quot; seconds.&quot;</span>);
+<a name="l00715"></a>00715                         nextReconnectTime = SystemTime::getUsec() + reconnectTimeout;
+<a name="l00716"></a>00716                 }
+<a name="l00717"></a>00717                 <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> AnalyticsLog());
+<a name="l00718"></a>00718         }
+<a name="l00719"></a>00719         
+<a name="l00720"></a>00720         <span class="keywordtype">void</span> setMaxConnectTries(<span class="keywordtype">unsigned</span> <span class="keywordtype">int</span> value) {
+<a name="l00721"></a>00721                 lock_guard&lt;boost::mutex&gt; l(lock);
+<a name="l00722"></a>00722                 maxConnectTries = value;
+<a name="l00723"></a>00723         }
+<a name="l00724"></a>00724         
+<a name="l00725"></a>00725         <span class="keywordtype">void</span> setReconnectTimeout(<span class="keywordtype">unsigned</span> <span class="keywordtype">long</span> <span class="keywordtype">long</span> usec) {
+<a name="l00726"></a>00726                 lock_guard&lt;boost::mutex&gt; l(lock);
+<a name="l00727"></a>00727                 reconnectTimeout = usec;
+<a name="l00728"></a>00728         }
+<a name="l00729"></a>00729         
+<a name="l00730"></a>00730         <span class="keywordtype">bool</span> isNull()<span class="keyword"> const </span>{
+<a name="l00731"></a>00731                 <span class="keywordflow">return</span> serverAddress.empty();
+<a name="l00732"></a>00732         }
+<a name="l00733"></a>00733         
+<a name="l00734"></a>00734         <span class="keywordtype">string</span> getAddress()<span class="keyword"> const </span>{
+<a name="l00735"></a>00735                 <span class="keywordflow">return</span> serverAddress;
+<a name="l00736"></a>00736         }
+<a name="l00737"></a>00737         
+<a name="l00738"></a>00738         <span class="keywordtype">string</span> getUsername()<span class="keyword"> const </span>{
+<a name="l00739"></a>00739                 <span class="keywordflow">return</span> username;
+<a name="l00740"></a>00740         }
+<a name="l00741"></a>00741         
+<a name="l00742"></a>00742         <span class="keywordtype">string</span> getPassword()<span class="keyword"> const </span>{
+<a name="l00743"></a>00743                 <span class="keywordflow">return</span> password;
+<a name="l00744"></a>00744         }
+<a name="l00745"></a>00745         
+<a name="l00746"></a>00746         FileDescriptor getConnection()<span class="keyword"> const </span>{
+<a name="l00747"></a>00747                 lock_guard&lt;boost::mutex&gt; l(lock);
+<a name="l00748"></a>00748                 lock_guard&lt;boost::mutex&gt; l2(sharedData-&gt;lock);
+<a name="l00749"></a>00749                 <span class="keywordflow">return</span> sharedData-&gt;client.getConnection();
+<a name="l00750"></a>00750         }
+<a name="l00751"></a>00751         <span class="comment"></span>
+<a name="l00752"></a>00752 <span class="comment">        /**</span>
+<a name="l00753"></a>00753 <span class="comment">         * @post !result.empty()</span>
+<a name="l00754"></a>00754 <span class="comment">         */</span>
+<a name="l00755"></a>00755         <span class="keywordtype">string</span> getNodeName()<span class="keyword"> const </span>{
+<a name="l00756"></a>00756                 <span class="keywordflow">return</span> nodeName;
+<a name="l00757"></a>00757         }
+<a name="l00758"></a>00758 };
+<a name="l00759"></a>00759 
+<a name="l00760"></a>00760 <span class="keyword">typedef</span> shared_ptr&lt;AnalyticsLogger&gt; AnalyticsLoggerPtr;
+<a name="l00761"></a>00761 
+<a name="l00762"></a>00762 } <span class="comment">// namespace Passenger</span>
+<a name="l00763"></a>00763 
+<a name="l00764"></a>00764 <span class="preprocessor">#endif </span><span class="comment">/* _PASSENGER_LOGGING_H_ */</span>
+<a name="l00765"></a>00765 
 </pre></div></div>
 <hr size="1"/><address style="text-align: right;"><small>Generated by&nbsp;
 <a href="http://www.doxygen.org/index.html">